From: Terry Wilson <twilson@digium.com>
Date: Tue, 21 Sep 2010 00:00:41 +0000 (+0000)
Subject: Add merge properties back.
X-Git-Tag: 11.0.0-beta1~2304
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61151e983c72813575c1fa3dce25644ffe9f960a;p=thirdparty%2Fasterisk.git

Add merge properties back.


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