From 50fa41ab8b2de8c65b6cb7fe1a68d9658dfd95bc Mon Sep 17 00:00:00 2001
From: Matthew Jordan <mjordan@digium.com>
Date: Mon, 21 Jan 2013 04:16:31 +0000
Subject: [PATCH] Re-add merge properties

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