automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@34125 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-06-14 15:06:38 +00:00
parent 36cacf788f
commit 05c3bd0de5
5 changed files with 11 additions and 5 deletions

View File

@@ -6,7 +6,8 @@
* Contributors:
* Steve Kann <stevek@stevek.com>
*
* Copyright on this file is disclaimed to Digium for inclusion in Asterisk
* A license has been granted to Digium (via disclaimer) for the use of
* this code.
*
* See http://www.asterisk.org for more information about
* the Asterisk project. Please do not directly contact