From e7690019d55adf7fd7168e013c42edea8e786849 Mon Sep 17 00:00:00 2001
From: Matthew Jordan <mjordan@digium.com>
Date: Tue, 5 Aug 2014 20:16:37 +0000
Subject: [PATCH] Remove automerge properties :-(

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@420090 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-- 
2.47.2