]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
No more conflicts on properties! svnmerge-block be gone!
authorJoshua Colp <jcolp@digium.com>
Tue, 23 Jan 2007 01:51:22 +0000 (01:51 +0000)
committerJoshua Colp <jcolp@digium.com>
Tue, 23 Jan 2007 01:51:22 +0000 (01:51 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51515 65c4cc65-6c06-0410-ace0-fbb531ad65f3


No differences found