From: Richard Mudgett <rmudgett@digium.com>
Date: Mon, 19 Sep 2011 19:00:16 +0000 (+0000)
Subject: Update merge 10 branch merge propterty.
X-Git-Tag: 11.0.0-beta1~1142
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2fe72628e196ade288bc2c3b91d3bd7c56bdfeb;p=thirdparty%2Fasterisk.git

Update merge 10 branch merge propterty.

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