From fc2d78f4bf6f1cbc7093229324a1d1ff00ff1d59 Mon Sep 17 00:00:00 2001
From: Matthew Jordan <mjordan@digium.com>
Date: Thu, 31 Jul 2014 11:57:11 +0000
Subject: [PATCH] Get rid of automerge properties

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