From: Richard Mudgett <rmudgett@digium.com>
Date: Mon, 19 Sep 2011 18:57:50 +0000 (+0000)
Subject: Restore 10 branch merge properties.
X-Git-Tag: 11.0.0-beta1~1143
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d414984d3ff7c85cdd67e45060ac32fb10931c4e;p=thirdparty%2Fasterisk.git

Restore 10 branch merge properties.

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