From: Mark Michelson <mmichelson@digium.com>
Date: Tue, 11 Dec 2012 21:53:06 +0000 (+0000)
Subject: And remove svnmerge-integrated property.
X-Git-Tag: 12.0.0-alpha1~1154
X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=commitdiff_plain;h=4ba38ce38b7b95eff0a2a6adefe8fec6797a2b45;ds=sidebyside

And remove svnmerge-integrated property.



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