diff options
author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-14 21:21:56 +0000 |
---|---|---|
committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-14 21:21:56 +0000 |
commit | a08541fe34b9c10c2b92f7cd8ba4011022c7d591 (patch) | |
tree | be7ac9608a3041c12116a3cd9a1d261b4c9c9b9d | |
parent | c7e14a4afb1176bc4de887f98bf18160407f25f1 (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@82455 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | LICENSE | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |