Merge branch 'master' of git://github.com/friendika/friendika

[friendica.git] / LICENSE

diff --git a/LICENSE b/LICENSE
index 38b32db2253a06b5b73c7cb192cb2b384eb36548..1bb0861466de2595b1af292fbcbdac6f3e1f6ffe 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 * Friendika
-* Copyright (c) 2010, Mike Macgirvin
+* Copyright (c) 2010, 2011 Mike Macgirvin
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -23,3 +23,20 @@
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Friendika incorporates other software which may be licensed under different 
+terms and conditions. Some system libraries which are supplied with and
+incorporated into Friendika were provided by their respective authors under
+the LGPL (Lesser GNU Public License) and may result in legal encumberance if 
+you make any code changes to these libraries. 
+
+Addon or "plugin" modules (projects by other authors and fully contained within
+the 'addon' and 'theme' directories) are licensed under terms provided by the
+respective software author or authors of those works, and MAY include copyleft 
+licenses such as GPLv3, AGPL, and/or commercial licenses. For the purposes of
+licensing, addon modules and themes are considered separate standalone works,
+where the "work as a whole" is defined as the embodiment of the theme or 
+addon module.
+  
+  
+