Restore branch 10 merge properties.
authorRichard Mudgett <rmudgett@digium.com>
Thu, 13 Oct 2011 22:58:30 +0000 (22:58 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Thu, 13 Oct 2011 22:58:30 +0000 (22:58 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340811 65c4cc65-6c06-0410-ace0-fbb531ad65f3


No differences found