Update merge 10 branch merge propterty.
authorRichard Mudgett <rmudgett@digium.com>
Mon, 19 Sep 2011 19:00:16 +0000 (19:00 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Mon, 19 Sep 2011 19:00:16 +0000 (19:00 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336661 65c4cc65-6c06-0410-ace0-fbb531ad65f3


No differences found