From: David M. Lee <dlee@digium.com>
Date: Mon, 28 Oct 2013 22:09:49 +0000 (+0000)
Subject: Put back several merge revisions that were lost in r402054
X-Git-Tag: 13.0.0-beta1~889
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d9e4fa81757d1f5ef03e7d58662350ff75e35b9;p=thirdparty%2Fasterisk.git

Put back several merge revisions that were lost in r402054

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