Fix merge properties to reflect Asterisk 10 branch
authorRussell Bryant <russell@russellbryant.com>
Thu, 21 Jul 2011 16:05:33 +0000 (16:05 +0000)
committerRussell Bryant <russell@russellbryant.com>
Thu, 21 Jul 2011 16:05:33 +0000 (16:05 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329105 65c4cc65-6c06-0410-ace0-fbb531ad65f3


No differences found