From c357e38925e1c63e9ea7d31e3e468564fdfe1cb5 Mon Sep 17 00:00:00 2001 From: Automerge script Date: Fri, 14 Sep 2007 21:21:56 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@82455 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index f8a4b2d208..99fe3a6aba 100644 --- 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