Fix merge 10 branch merge properties.
authorRichard Mudgett <rmudgett@digium.com>
Mon, 22 Aug 2011 19:52:30 +0000 (19:52 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Mon, 22 Aug 2011 19:52:30 +0000 (19:52 +0000)
commit4110af69768c996a7b2d6fbfcec280f2840bb3bf
tree7ee015d81a6e8c0f0984817f979f5f1d0816fa47
parent3b53a9cdb302417e42928225266a763bf826b9be
Fix merge 10 branch merge properties.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@332879 65c4cc65-6c06-0410-ace0-fbb531ad65f3