Put back several merge revisions that were lost in r402054
authorDavid M. Lee <dlee@digium.com>
Mon, 28 Oct 2013 22:09:49 +0000 (22:09 +0000)
committerDavid M. Lee <dlee@digium.com>
Mon, 28 Oct 2013 22:09:49 +0000 (22:09 +0000)
commit0d9e4fa81757d1f5ef03e7d58662350ff75e35b9
tree331fd6afbf8fc765f0f407d8db1112511822c6f1
parent13c645ef02592e6b3b9a125e98db9317d019a27b
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