[svn-commits] kpfleming: branch 1.6.0 r132313 - in /branches/1.6.0: ./ LICENSE

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Sat Jul 19 11:47:12 2008
New Revision: 132313

URL: http://svn.digium.com/view/asterisk?view=rev&rev=132313
Log:
Merged revisions 132312 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r132312 | kpfleming | 2008-07-19 11:46:33 -0500 (Sat, 19 Jul 2008) | 10 lines

Merged revisions 132311 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r132311 | kpfleming | 2008-07-19 11:45:52 -0500 (Sat, 19 Jul 2008) | 2 lines

grant a license exception to allow distribution of Asterisk binaries that use the UW IMAP Toolkit (which is licensed under a non-GPL-compatible license)

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/LICENSE

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/LICENSE
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/LICENSE?view=diff&rev=132313&r1=132312&r2=132313
==============================================================================
--- branches/1.6.0/LICENSE (original)
+++ branches/1.6.0/LICENSE Sat Jul 19 11:47:12 2008
@@ -31,8 +31,8 @@
 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 and distribute the resulting binary files.
+Specific permission is also granted to link Asterisk with OpenSSL, OpenH323
+and/or the UW IMAP Toolkit and distribute the resulting binary files.
 
 In addition, Asterisk implements two management/control protocols: the
 Asterisk Manager Interface (AMI) and the Asterisk Gateway Interface