From: Matthew Jordan <mjordan@digium.com>
Date: Fri, 12 Dec 2014 22:49:58 +0000 (+0000)
Subject: Add 11 merge properties
X-Git-Tag: 13.2.0-rc1~121
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ff0d266a66759307885787d3ef5e7209c080510;p=thirdparty%2Fasterisk.git

Add 11 merge properties

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