Updated 10 merge property.
authorRichard Mudgett <rmudgett@digium.com>
Tue, 20 Sep 2011 22:53:12 +0000 (22:53 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Tue, 20 Sep 2011 22:53:12 +0000 (22:53 +0000)
commit38a7c68851348076deadf336e6e47f13ac16aa3e
tree82df38ccf425e131c4bf52f155398c159bd90a0b
parentbbafe3bd2ccd77a5d1b1841f0c549c07a84b8865
Updated 10 merge property.

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