Remove automerge properties.
authorMark Michelson <mmichelson@digium.com>
Mon, 4 Jun 2012 20:30:07 +0000 (20:30 +0000)
committerMark Michelson <mmichelson@digium.com>
Mon, 4 Jun 2012 20:30:07 +0000 (20:30 +0000)
commit458f6c4bc0ded23a0da71cb3202d32d1ec5ce360
tree4d6f57c4358566c5508d79e97560640ce59df5c8
parent14a985560ed5830aa3e1b5880890a59a5d0f0c2f
Remove automerge properties.

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