merge everything back from mainline branch

[selectricity] / old_api_code / selectricity_service.rb

diff --git a/old_api_code/selectricity_service.rb b/old_api_code/selectricity_service.rb
index aba9c02acae1fe455001e2a98ab1bbcbd6e9a6ac..30a8792c5fdb71232c4294e6b1a41902fdc3d20e 100644 (file)
--- a/old_api_code/selectricity_service.rb
+++ b/old_api_code/selectricity_service.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.
 
 require 'action_controller/integration'