And remove svnmerge-integrated property.
authorMark Michelson <mmichelson@digium.com>
Tue, 11 Dec 2012 21:53:06 +0000 (21:53 +0000)
committerMark Michelson <mmichelson@digium.com>
Tue, 11 Dec 2012 21:53:06 +0000 (21:53 +0000)
commit4ba38ce38b7b95eff0a2a6adefe8fec6797a2b45
tree32690da27b46936c0effc95140c20ebc46c0e73a
parent09cd2ebe9c283b74dfcc2d11cb10f07b770faa75
And remove svnmerge-integrated property.

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