Erased the svnmerge-integrated prop from trunk. Please, in your svnmerge-ings, don...
authorSteve Murphy <murf@digium.com>
Mon, 20 Nov 2006 14:08:04 +0000 (14:08 +0000)
committerSteve Murphy <murf@digium.com>
Mon, 20 Nov 2006 14:08:04 +0000 (14:08 +0000)
commit0f58d0e1f8339c48ed496e8a306e20994d227886
treeef93d4cd7e3015d4a35d3ad8a3a9bc1d5af46eb6
parent4e47ce525bd47bb19103b8c3283e31810335d69d
Erased the svnmerge-integrated prop from trunk. Please, in your svnmerge-ings, don't let these props leak into the trunk or branches.

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