From: Kevin Harwell <kharwell@digium.com>
Date: Wed, 20 Feb 2013 16:16:40 +0000 (+0000)
Subject: Updated merge properties to reflect correct trace.
X-Git-Tag: certified/11.2-cert1-rc1~2^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21fce08b7c0a74b7291b9bfc791dafc2fff0b08d;p=thirdparty%2Fasterisk.git

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
---