From: Mark Michelson <mmichelson@digium.com>
Date: Mon, 27 Aug 2012 17:49:57 +0000 (+0000)
Subject: Re-add merge and block properties.
X-Git-Tag: 11.0.0-beta2~82
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=50d55266a124470191d6c52483e4a768819cc9ef;p=thirdparty%2Fasterisk.git

Re-add merge and block properties.



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