From: Jason Parker <jparker@digium.com>
Date: Mon, 24 Sep 2012 21:22:46 +0000 (+0000)
Subject: reenable automerge
X-Git-Tag: 10.10.0-digiumphones-rc1~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a48d4a2c845e79e738824eca765fa7004b153f85;p=thirdparty%2Fasterisk.git

reenable automerge

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