merge everything back from mainline branch

[selectricity] / app / controllers / front_controller.rb

diff --git a/app/controllers/front_controller.rb b/app/controllers/front_controller.rb
index 4bcbd0a8cf37a4689618f0b6fb0b18c29a9700e0..f84d39672bad9b2cc37af05f264946e120a9c65a 100644 (file)
--- a/app/controllers/front_controller.rb
+++ b/app/controllers/front_controller.rb
@@ -2,19 +2,8 @@
 # Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
 # Copyright (C) 2007 Massachusetts Institute of Technology
 #
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# This program is free software. Please see the COPYING file for
+# details.
 
 class FrontController < ApplicationController
   layout 'frontpage'