From def53014ec8a79ad5b325d2eb77409b1df3c5176 Mon Sep 17 00:00:00 2001
From: Matthew Jordan <mjordan@digium.com>
Date: Tue, 12 Jun 2012 14:09:41 +0000
Subject: [PATCH] Update merge property information

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