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
1.4
Kevin P. Fleming 19 years ago
parent 03ce34e1aa
commit 4ee62f1bcd

Diff Content Not Available