Merge pull request #236 from daira/2725.timezone-test.0

[tahoe-lafs/tahoe-lafs.git] / COPYING.GPL

diff --git a/COPYING.GPL b/COPYING.GPL
index 030f78205f30efc08ce364dddd4c6d9a29ba29ca..5075166af9ae64484a96ef16f664d0bc669a9cfd 100644 (file)
--- a/COPYING.GPL
+++ b/COPYING.GPL
@@ -1,47 +1,114 @@
 This work also comes with the added permission that you may combine it with a
 work licensed under the OpenSSL license (any version) and distribute the
 resulting combined work, as long as you follow the requirements of the
-licences of this work in regard to all of the the resulting combined work
+licences of this work in regard to all of the resulting combined work
 aside from the work licensed under the OpenSSL license.
 
 This work also comes with the added permission that you may combine it with a
 work licensed under the Eclipse Public Licence (any version) and distribute
 the resulting combined work, as long as you follow the requirements of the
-licences of this work in regard to all of the the resulting combined work
+licences of this work in regard to all of the resulting combined work
 aside from the work licensed under the Eclipse Public Licence.
 
 This work also comes with the added permission that you may combine it with a
 work licensed under the Q Public Licence (any version) and distribute the
 resulting combined work, as long as you follow the requirements of the
-licences of this work in regard to all of the the resulting combined work
+licences of this work in regard to all of the resulting combined work
 aside from the work licensed under the Q Public Licence.
 
 This work also comes with the added permission that you may combine it with a
 work licensed under the Apache Licence (any version) and distribute the
 resulting combined work, as long as you follow the requirements of the
-licences of this work in regard to all of the the resulting combined work
+licences of this work in regard to all of the resulting combined work
 aside from the work licensed under the Apache Licence.
 
 This work also comes with the added permission that you may combine it with a
 work licensed under the GNU Lesser General Public License (any version) and
 distribute the resulting combined work, as long as you follow the
-requirements of the licences of this work in regard to all of the the
+requirements of the licences of this work in regard to all of the
 resulting combined work aside from the work licensed under the GNU Lesser
 General Public License.
 
 This work also comes with the added permission that you may combine it with a
 work licensed under the Zope Public License (any version) and distribute the
 resulting combined work, as long as you follow the requirements of the
-licences of this work in regard to all of the the resulting combined work
+licences of this work in regard to all of the resulting combined work
 aside from the work licensed under the Zope Public License.
 
 This work also comes with the added permission that you may combine it with a
 work licensed under the Python Software Foundation License (any version) and
 distribute the resulting combined work, as long as you follow the
-requirements of the licences of this work in regard to all of the the
+requirements of the licences of this work in regard to all of the
 resulting combined work aside from the work licensed under the Python
 Software Foundation License.
 
+This work also comes with the added permission that you may combine it with a
+work licensed under the Academic Free License (any version) and distribute
+the resulting combined work, as long as you follow the requirements of the
+licences of this work in regard to all of the resulting combined work
+aside from the work licensed under the Academic Free License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the Apple Public Source License (any version) and
+distribute the resulting combined work, as long as you follow the
+requirements of the licences of this work in regard to all of the
+resulting combined work aside from the work licensed under the Apple Public
+Source License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the BitTorrent Open Source License (any version) and
+distribute the resulting combined work, as long as you follow the
+requirements of the licences of this work in regard to all of the
+resulting combined work aside from the work licensed under the BitTorrent
+Open Source License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the Lucent Public License (any version) and distribute
+the resulting combined work, as long as you follow the requirements of the
+licences of this work in regard to all of the resulting combined work
+aside from the work licensed under the Lucent Public License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the Jabber Open Source License (any version) and
+distribute the resulting combined work, as long as you follow the
+requirements of the licences of this work in regard to all of the
+resulting combined work aside from the work licensed under the Jabber Open
+Source License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the Common Development and Distribution License (any
+version) and distribute the resulting combined work, as long as you follow
+the requirements of the licences of this work in regard to all of the
+resulting combined work aside from the work licensed under the Common
+Development and Distribution License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the Microsoft Public License (any version) and distribute
+the resulting combined work, as long as you follow the requirements of the
+licences of this work in regard to all of the resulting combined work
+aside from the work licensed under the Microsoft Public License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the Microsoft Reciprocal License (any version) and
+distribute the resulting combined work, as long as you follow the
+requirements of the licences of this work in regard to all of the
+resulting combined work aside from the work licensed under the Microsoft
+Reciprocal License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the Sun Industry Standards Source License (any version)
+and distribute the resulting combined work, as long as you follow the
+requirements of the licences of this work in regard to all of the
+resulting combined work aside from the work licensed under the Sun Industry
+Standards Source License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the Open Software License (any version) and distribute
+the resulting combined work, as long as you follow the requirements of the
+licences of this work in regard to all of the resulting combined work
+aside from the work licensed under the Open Software License.
+
+
 
                    GNU GENERAL PUBLIC LICENSE
                       Version 2, June 1991