Oops. Getting rid of svnmerge-integrated and automerge stuff
authorMark Michelson <mmichelson@digium.com>
Thu, 20 Sep 2007 21:37:28 +0000 (21:37 +0000)
committerMark Michelson <mmichelson@digium.com>
Thu, 20 Sep 2007 21:37:28 +0000 (21:37 +0000)
commitdd3ef30d6798838028a882a9b539c7a0473776da
treec6955634bc49381bb24d40731bd96532037c5006
parent25763e2573e6fc71b8e339d6871da5fd8e265d10
Oops. Getting rid of svnmerge-integrated and automerge stuff

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