From e6e0fb0d9ae1988052c7e80baa694313163a19ce Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Thu, 21 Jul 2011 16:05:33 +0000
Subject: [PATCH] Fix merge properties to reflect Asterisk 10 branch

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