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

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