From a48d4a2c845e79e738824eca765fa7004b153f85 Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Mon, 24 Sep 2012 21:22:46 +0000
Subject: [PATCH] reenable automerge

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