From: Jason Parker <jparker@digium.com>
Date: Tue, 12 Jun 2012 16:11:27 +0000 (+0000)
Subject: enable automerge
X-Git-Tag: 10.7.0-digiumphones-rc1~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6194c372bd0d207411082c4038e75f65c1fc48cc;p=thirdparty%2Fasterisk.git

enable automerge

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