mirror of https://github.com/asterisk/asterisk
I messed up and accidentally reverted the trunk-merged prop before committing 173546. Added it manually.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@173547 65c4cc65-6c06-0410-ace0-fbb531ad65f31.6.0
parent
58d71a9470
commit
1b4e2a5d6b