From 8cbd92f9f8269a424e26b6cb08516905d77c944b Mon Sep 17 00:00:00 2001
From: markjaquith <markjaquith@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 8 Jun 2011 18:18:21 +0000
Subject: [PATCH] Move copyright notices to license.txt. props hakre. props
 aaroncampbell. fixes #16269

git-svn-id: http://svn.automattic.com/wordpress/trunk@18201 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 license.txt             | 41 ++++++++++++++++++++++++++++++++++++++++-
 wp-includes/version.php | 18 ------------------
 2 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/license.txt b/license.txt
index eda6b00adc..431a146a67 100644
--- a/license.txt
+++ b/license.txt
@@ -1,7 +1,46 @@
+WordPress - Web publishing software
+
+Copyright 2011 by the contributors
+
+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 St, Fifth Floor, Boston, MA  02110-1301  USA
+
+This program incorporates work covered by the following copyright and
+permission notices:
+
+  b2 is (c) 2001, 2002 Michel Valdrighi - m@tidakada.com -
+  http://tidakada.com
+
+  Wherever third party code has been used, credit has been given in the code's
+  comments.
+
+  b2 is released under the GPL
+
+and
+
+  WordPress - Web publishing software
+
+  Copyright 2003-2010 by the contributors
+
+  WordPress is released under the GPL
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc. 
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
  51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 
  Everyone is permitted to copy and distribute verbatim copies
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 0232c5683a..fc335517fc 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -1,22 +1,4 @@
 <?php
-/*
-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
  *