From a7b1c2eafbe53ca06b4ef57b65f4efcfb072eff0 Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Mon, 19 Sep 2011 16:21:03 +0000
Subject: [PATCH] Remove weird mergeinfo props that make merges annoying
 sometimes.

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