From: Matthew Jordan <mjordan@digium.com>
Date: Tue, 12 Jun 2012 14:09:41 +0000 (+0000)
Subject: Update merge property information
X-Git-Tag: 11.0.0-beta1~237
X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=commitdiff_plain;h=def53014ec8a79ad5b325d2eb77409b1df3c5176;ds=inline

Update merge property information

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