From: Richard Mudgett <rmudgett@digium.com>
Date: Tue, 20 Sep 2011 22:51:41 +0000 (+0000)
Subject: Restore branch-10 merge properties.
X-Git-Tag: 11.0.0-beta1~1130
X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=commitdiff_plain;h=bbafe3bd2ccd77a5d1b1841f0c549c07a84b8865

Restore branch-10 merge properties.

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