Set new merge properties on 12
authorMatthew Jordan <mjordan@digium.com>
Fri, 23 Aug 2013 22:40:57 +0000 (22:40 +0000)
committerMatthew Jordan <mjordan@digium.com>
Fri, 23 Aug 2013 22:40:57 +0000 (22:40 +0000)
commit062290bde0691db4a071556db039fee5744e9982
treeccd292d989a4eaba825e398ec605bf850c4e6ecd
parent9c713d12dab7f6fc1e3ccd80ac3f4541f9069a2e
Set new merge properties on 12

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