Add merge properties back.
authorTerry Wilson <twilson@digium.com>
Tue, 21 Sep 2010 00:00:41 +0000 (00:00 +0000)
committerTerry Wilson <twilson@digium.com>
Tue, 21 Sep 2010 00:00:41 +0000 (00:00 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287761 65c4cc65-6c06-0410-ace0-fbb531ad65f3


No differences found