Remove 12 merge properties
authorMatthew Jordan <mjordan@digium.com>
Fri, 8 Aug 2014 01:36:16 +0000 (01:36 +0000)
committerMatthew Jordan <mjordan@digium.com>
Fri, 8 Aug 2014 01:36:16 +0000 (01:36 +0000)
commit38a0df95b176d379df148910adac0ff5a560f91c
tree7390495efadcb2a81965926963b3d053e865f7fb
parent5760526f69ad02189c8e385e2e974be4cba11b6e
Remove 12 merge properties

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