From: Matthew Jordan <mjordan@digium.com>
Date: Fri, 23 Aug 2013 22:40:57 +0000 (+0000)
Subject: Set new merge properties on 12
X-Git-Tag: 13.0.0-beta1~1191
X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=commitdiff_plain;h=062290bde0691db4a071556db039fee5744e9982;hp=9c713d12dab7f6fc1e3ccd80ac3f4541f9069a2e

Set new merge properties on 12

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