Merged revisions 82335 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Thu, 13 Sep 2007 18:13:44 +0000 (18:13 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Thu, 13 Sep 2007 18:13:44 +0000 (18:13 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r82335 | kpfleming | 2007-09-13 11:12:00 -0700 (Thu, 13 Sep 2007) | 10 lines

Merged revisions 82334 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r82334 | kpfleming | 2007-09-13 11:10:12 -0700 (Thu, 13 Sep 2007) | 2 lines

clarify the OpenSSL and OpenH323 license exceptions

........

................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82336 65c4cc65-6c06-0410-ace0-fbb531ad65f3

LICENSE

diff --git a/LICENSE b/LICENSE
index 36e369c..d65ce4e 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -32,7 +32,7 @@ GPL'd products (although if you've written a module for Asterisk we
 would strongly encourage you to make the same exception that we do).
 
 Specific permission is also granted to link Asterisk with OpenSSL and
-OpenH323.
+OpenH323 and distribute the resulting binary files.
 
 In addition, Asterisk implements two management/control protocols: the
 Asterisk Manager Interface (AMI) and the Asterisk Gateway Interface