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

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