From: Matthew Jordan <mjordan@digium.com>
Date: Tue, 5 Aug 2014 20:16:37 +0000 (+0000)
Subject: Remove automerge properties :-(
X-Git-Tag: 12.5.0-rc1~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7690019d55adf7fd7168e013c42edea8e786849;p=thirdparty%2Fasterisk.git

Remove automerge properties :-(


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