From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 13 Jul 2011 20:40:19 +0000 (+0000)
Subject: set 1.10 merge properties
X-Git-Tag: 11.0.0-beta1~1356
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e8d293730e028d2de5559575032d20cc3dcd3be;p=thirdparty%2Fasterisk.git

set 1.10 merge properties

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