Update merge property information
authorMatthew Jordan <mjordan@digium.com>
Tue, 12 Jun 2012 14:09:41 +0000 (14:09 +0000)
committerMatthew Jordan <mjordan@digium.com>
Tue, 12 Jun 2012 14:09:41 +0000 (14:09 +0000)
commitdef53014ec8a79ad5b325d2eb77409b1df3c5176
tree181ee410caf4143b8938390e89447750bab0bd81
parent8bc3c1e20fe11204b6aa39ba0d23fcee67b7813e
Update merge property information

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