Re-add merge properties
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@379610 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
822f5f5ff1
commit
50fa41ab8b