Re-add merge properties
authorMatthew Jordan <mjordan@digium.com>
Mon, 21 Jan 2013 04:16:31 +0000 (04:16 +0000)
committerMatthew Jordan <mjordan@digium.com>
Mon, 21 Jan 2013 04:16:31 +0000 (04:16 +0000)
commit50fa41ab8b2de8c65b6cb7fe1a68d9658dfd95bc
treec996018b5926dc0152cabc08f4af82101b0777ee
parent822f5f5ff1826af11175e5dd026ec35eba443a07
Re-add merge properties

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