From 21fce08b7c0a74b7291b9bfc791dafc2fff0b08d Mon Sep 17 00:00:00 2001
From: Kevin Harwell <kharwell@digium.com>
Date: Wed, 20 Feb 2013 16:16:40 +0000
Subject: [PATCH] Updated merge properties to reflect correct trace.

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