Update merge property information

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@368794 65c4cc65-6c06-0410-ace0-fbb531ad65f3
certified/11.2
Matthew Jordan 14 years ago
parent 8bc3c1e20f
commit def53014ec

Diff Content Not Available