From: David M. Lee <dlee@digium.com>
Date: Mon, 28 Oct 2013 22:05:37 +0000 (+0000)
Subject: Put back several merge revisions that were lost in r401962
X-Git-Tag: 13.0.0-beta1~890
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13c645ef02592e6b3b9a125e98db9317d019a27b;p=thirdparty%2Fasterisk.git

Put back several merge revisions that were lost in r401962

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