Steve Murphy
authored
removed the svnmerge-integrated property from trunk; it's confusing svnmerge in newly created branches git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47997 65c4cc65-6c06-0410-ace0-fbb531ad65f3