Remove weird mergeinfo props that make merges annoying sometimes.
authorJason Parker <jparker@digium.com>
Mon, 19 Sep 2011 16:22:52 +0000 (16:22 +0000)
committerJason Parker <jparker@digium.com>
Mon, 19 Sep 2011 16:22:52 +0000 (16:22 +0000)
commit052ed863f3eb3b94e2edcc0d782092d8a9bb7ad9
tree9c9c05578b9b2ef1d72bc9984d3b1d2514ef5720
parentb1b315fcb2793a5e1636ad7129f8903a38133f50
Remove weird mergeinfo props that make merges annoying sometimes.

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