No more conflicts on properties! svnmerge-block be gone!

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51515 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Joshua Colp 19 years ago
parent fa6d3941df
commit 445abea012

Diff Content Not Available