Remove automerge propertrties added in r381527
authorMatthew Jordan <mjordan@digium.com>
Fri, 15 Feb 2013 15:26:51 +0000 (15:26 +0000)
committerMatthew Jordan <mjordan@digium.com>
Fri, 15 Feb 2013 15:26:51 +0000 (15:26 +0000)
commit32e8b02f8f4957ba2a5da1390843b9c6fc960621
tree821330ff71a4484afa46ade4a2bbd211c800a992
parentd04ab3c6450f3d92aa004ae9d6e0e7da51f702a3
Remove automerge propertrties added in r381527

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