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)
commitf2fe72628e196ade288bc2c3b91d3bd7c56bdfeb
tree9c9c05578b9b2ef1d72bc9984d3b1d2514ef5720
parentd414984d3ff7c85cdd67e45060ac32fb10931c4e
Update merge 10 branch merge propterty.

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