Put back several merge revisions that were lost in r401962
authorDavid M. Lee <dlee@digium.com>
Mon, 28 Oct 2013 22:05:37 +0000 (22:05 +0000)
committerDavid M. Lee <dlee@digium.com>
Mon, 28 Oct 2013 22:05:37 +0000 (22:05 +0000)
commit13c645ef02592e6b3b9a125e98db9317d019a27b
tree331fd6afbf8fc765f0f407d8db1112511822c6f1
parentfead41381bff772df7828d8f6df789d7a5b5d34e
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