From: Jason Parker <jparker@digium.com>
Date: Mon, 19 Sep 2011 16:22:52 +0000 (+0000)
Subject: Remove weird mergeinfo props that make merges annoying sometimes.
X-Git-Tag: 11.0.0-beta1~1144
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=052ed863f3eb3b94e2edcc0d782092d8a9bb7ad9;p=thirdparty%2Fasterisk.git

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
---