Edit the merge properties to match their names.
authorKevin P. Fleming <kpfleming@digium.com>
Tue, 19 Jul 2011 21:32:35 +0000 (21:32 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Tue, 19 Jul 2011 21:32:35 +0000 (21:32 +0000)
commit248b0f7e53aa6e05fcc9cd18d81bc35ded9df26e
tree6b0c0bf9d0548cfd085d9a8e3741f4de71fb4f79
parentce291c116c51c629b315bc61ab2896b4a756347d
Edit the merge properties to match their names.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@328880 65c4cc65-6c06-0410-ace0-fbb531ad65f3