Jason Parker
authored
........ Merged revisions 383061 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 383062 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@383063 65c4cc65-6c06-0410-ace0-fbb531ad65f3