From 7406c1b24286cfd8527d44195745a3daac605a60 Mon Sep 17 00:00:00 2001
From: Steve Murphy <murf@digium.com>
Date: Fri, 24 Nov 2006 18:17:25 +0000
Subject: [PATCH] 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