be more careful when merging in a branch with automerge properties :-(
authorKevin P. Fleming <kpfleming@digium.com>
Thu, 30 Mar 2006 14:19:25 +0000 (14:19 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Thu, 30 Mar 2006 14:19:25 +0000 (14:19 +0000)
commit4ee62f1bcd04a3d7bfb92268cf8444c06d01a758
treee7092725bdc5ef9ca65c6dff1984e877710b625a
parent03ce34e1aaa2371899011bd2ed5d70180c74b659
be more careful when merging in a branch with automerge properties :-(

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