Restore 10 branch merge properties.
authorRichard Mudgett <rmudgett@digium.com>
Mon, 19 Sep 2011 18:57:50 +0000 (18:57 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Mon, 19 Sep 2011 18:57:50 +0000 (18:57 +0000)
commitd414984d3ff7c85cdd67e45060ac32fb10931c4e
tree9c9c05578b9b2ef1d72bc9984d3b1d2514ef5720
parent052ed863f3eb3b94e2edcc0d782092d8a9bb7ad9
Restore 10 branch merge properties.

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