From: Jason Parker <jparker@digium.com>
Date: Tue, 2 Oct 2012 16:41:33 +0000 (+0000)
Subject: Re-enable automerge.
X-Git-Tag: 10.10.0-digiumphones-rc1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3409955b52077b4392720ad5f3a797bb4753503a;p=thirdparty%2Fasterisk.git

Re-enable automerge.

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