From: Jason Parker <jparker@digium.com>
Date: Tue, 8 Jan 2013 19:13:16 +0000 (+0000)
Subject: Re-enable automerge.
X-Git-Tag: 10.12.0-digiumphones-rc2~3^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc0af4273cdb47e0a7bf7317edc2f4f4fb3ac84d;p=thirdparty%2Fasterisk.git

Re-enable automerge.

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