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)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@368794 65c4cc65-6c06-0410-ace0-fbb531ad65f3


No differences found