Fix merge properties to reflect Asterisk 10 branch

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329105 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2011-07-21 16:05:33 +00:00
parent 3a4520214a
commit e6e0fb0d9a

Diff Content Not Available