From: David M. Lee <dlee@digium.com>
Date: Fri, 13 Sep 2013 14:43:56 +0000 (+0000)
Subject: Recorded merge of revisions 399035,399049 from http://svn.asterisk.org/svn/asterisk... 
X-Git-Tag: 13.0.0-beta1~1088
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c24c69724f4dcebc655707783b4af177435d249;p=thirdparty%2Fasterisk.git

Recorded merge of revisions 399035,399049 from http://svn.asterisk.org/svn/asterisk/branches/12

These were lost in r399071


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@399081 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---