[SCM] Classic first person shooter branch, master, updated. 7d86b5c425bad46b5bbab73e73dc1cd96e7e4e5c

[David Banks]

The following commit has been merged in the master branch:
commit 7d86b5c425bad46b5bbab73e73dc1cd96e7e4e5c
Author: David Banks <amoebae at gmail.com>
Date:   Sat Jul 9 19:55:35 2011 +0100

    relicense work to GPL-2

diff --git a/debian/copyright b/debian/copyright
index 17be656..3ba502a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,16 +3,13 @@ Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=co&revision
 Files: *
 Copyright: © 2011 David Banks
            © 2011 Simon McVittie
-License: GPL-3+
+License: GPL-2+
   Permission is granted to copy, distribute and/or modify this work under the
-  terms of the GNU General Public License, Version 3, or any later version
+  terms of the GNU General Public License, Version 2, or any later version
   published by the Free Software Foundation.
   .
   On Debian systems, the complete text of the GNU General Public License can
-  be found in /usr/share/common-licenses/GPL-3.
-  .
-  (For all parts of the package except those contributed by David Banks,
-  similar permission is also granted for the GPL v2.)
+  be found in /usr/share/common-licenses/GPL-2.
 
 Files: quake1+2.svg
 Copyright: © 2011 Simon McVittie

-- 
Classic first person shooter