Edit the merge properties to match their names.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@328880 65c4cc65-6c06-0410-ace0-fbb531ad65f3
certified/11.2
Kevin P. Fleming 14 years ago
parent ce291c116c
commit 248b0f7e53

Diff Content Not Available