From 248b0f7e53aa6e05fcc9cd18d81bc35ded9df26e Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" <kpfleming@digium.com> Date: Tue, 19 Jul 2011 21:32:35 +0000 Subject: [PATCH] Edit the merge properties to match their names. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@328880 65c4cc65-6c06-0410-ace0-fbb531ad65f3 -- GitLab