From: Richard Mudgett <rmudgett@digium.com>
Date: Mon, 22 Aug 2011 19:52:30 +0000 (+0000)
Subject: Fix merge 10 branch merge properties.
X-Git-Tag: 11.0.0-beta1~1234
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4110af69768c996a7b2d6fbfcec280f2840bb3bf;p=thirdparty%2Fasterisk.git

Fix merge 10 branch merge properties.

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