From 50d55266a124470191d6c52483e4a768819cc9ef Mon Sep 17 00:00:00 2001
From: Mark Michelson <mmichelson@digium.com>
Date: Mon, 27 Aug 2012 17:49:57 +0000
Subject: [PATCH] Re-add merge and block properties.

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