From: Matthew Jordan <mjordan@digium.com>
Date: Fri, 15 Feb 2013 15:26:51 +0000 (+0000)
Subject: Remove automerge propertrties added in r381527
X-Git-Tag: 13.0.0-beta1~2090
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32e8b02f8f4957ba2a5da1390843b9c6fc960621;p=thirdparty%2Fasterisk.git

Remove automerge propertrties added in r381527

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