From: Richard Mudgett <rmudgett@digium.com>
Date: Mon, 22 Aug 2011 19:41:03 +0000 (+0000)
Subject: Fix merge property.
X-Git-Tag: 10.0.0-beta2~109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4731db7a16490e3a06ad06080b5261a90fe261d9;p=thirdparty%2Fasterisk.git

Fix merge property.

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