From 2ebbbd7bddcfbe8deb423964c0d2706c05e95e16 Mon Sep 17 00:00:00 2001
From: markjaquith <markjaquith@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 14 Jan 2011 19:26:43 +0000
Subject: [PATCH] WordPress contains libraries only available under the GPL v2
 or later. No one cares about the GPL v1 anymore. We are now specifically
 saying that WordPress is available under the GPL version 2 or (at your
 option) any later version. This was discussed with the entire core team.

git-svn-id: http://svn.automattic.com/wordpress/trunk@17301 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 readme.html             |  2 +-
 wp-includes/version.php | 20 +++++++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/readme.html b/readme.html
index 6a3757dfc..17815e3ab 100644
--- a/readme.html
+++ b/readme.html
@@ -102,7 +102,7 @@
 <p>WordPress is the official continuation of <a href="http://cafelog.com/">b2/caf&#233;log</a>, which came from Michel V. The work has been continued by the <a href="http://wordpress.org/about/">WordPress developers</a>. If you would like to support WordPress, please consider <a href="http://wordpress.org/donate/" title="Donate to WordPress">donating</a>.</p>
 
 <h1>License</h1>
-<p>WordPress is released under the <abbr title="GNU Public License">GPL</abbr> (see <a href="license.txt">license.txt</a>).</p>
+<p>WordPress is free software, and is released under the terms of the <abbr title="GNU Public License">GPL</abbr> version 2 or (at your option) any later version. See <a href="license.txt">license.txt</a>.</p>
 
 
 </body>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index cea70d986..958f6b965 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -1,7 +1,21 @@
 <?php
-/**
- * This holds the version number in a separate file so we can bump it without cluttering the SVN
- */
+/*
+WordPress - Web publishing software
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+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 General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
 
 /**
  * The WordPress version string