From 2cb5952026033d29e7e9980c68373a406ee7e57a Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Tue, 7 Aug 2012 15:16:53 +0000
Subject: [PATCH] Fix merge prop

git-svn-id: https://origsvn.digium.com/svn/asterisk/certified/branches/1.8.15@370840 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-- 
2.47.2