From: Matthew Jordan <mjordan@digium.com>
Date: Fri, 8 Aug 2014 01:36:16 +0000 (+0000)
Subject: Remove 12 merge properties
X-Git-Tag: 14.0.0-beta1~1782
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38a0df95b176d379df148910adac0ff5a560f91c;p=thirdparty%2Fasterisk.git

Remove 12 merge properties

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