From bc0af4273cdb47e0a7bf7317edc2f4f4fb3ac84d Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Tue, 8 Jan 2013 19:13:16 +0000
Subject: [PATCH] Re-enable automerge.

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