From: David M. Lee <dlee@digium.com>
Date: Fri, 20 Dec 2013 22:03:43 +0000 (+0000)
Subject: Remove automerge properties
X-Git-Tag: 13.0.0-beta1~704
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd0ef2508021b0040a6439cc9e3e3335b40741aa;p=thirdparty%2Fasterisk.git

Remove automerge properties
........

Merged revisions 404488 from http://svn.asterisk.org/svn/asterisk/branches/12


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