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)
commit12a8ae6c91d238e169c5aafd9988393143b84080
tree044e275d1f1f98f1dffea2265a1bc28413f6a702
parent5460e72015591cdaf0a8a2f8707497a22f0058eb
Merged revisions 82335 via svnmerge from
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