From: Kevin P. Fleming <kpfleming@digium.com>
Date: Tue, 19 Jul 2011 21:32:35 +0000 (+0000)
Subject: Edit the merge properties to match their names.
X-Git-Tag: 11.0.0-beta1~1336
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=248b0f7e53aa6e05fcc9cd18d81bc35ded9df26e;p=thirdparty%2Fasterisk.git

Edit the merge properties to match their names.



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