From: Matthew Jordan <mjordan@digium.com>
Date: Mon, 21 Jan 2013 04:16:31 +0000 (+0000)
Subject: Re-add merge properties
X-Git-Tag: 13.0.0-beta1~2186
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50fa41ab8b2de8c65b6cb7fe1a68d9658dfd95bc;p=thirdparty%2Fasterisk.git

Re-add merge properties

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