www

commit b544c83c44962b4d94c6295152c06db11257b54a
parent d8fe05dc746689f9ee8e21ae15a144b327259cb9
Author: Dan Stillman <dstillman@zotero.org>
Date:   Wed, 16 Jun 2010 19:55:00 +0000

Add additional copyright/trademark info


Diffstat:
M
COPYING
 | 
16
++++++++++++++++

1 file changed, 16 insertions(+), 0 deletions(-)
diff --git a/COPYING b/COPYING
@@ -1,3 +1,19 @@
+Zotero is Copyright © 2006, 2007, 2008, 2009, 2010 Center for History and New Media,
+George Mason University, Fairfax, Virginia, USA  http://zotero.org
+
+The Center for History and New Media distributes the Zotero source code
+under the GNU General Public License, version 3 (GPLv3). The full text
+of this license is given below.
+
+The Zotero name is a registered trademark of George Mason University.
+See http://zotero.org/trademark for more information.
+
+Third-party copyright in this distribution is noted where applicable.
+
+All rights not expressly granted are reserved.
+
+=========================================================================
+
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007