From: Jason Parker <jparker@digium.com>
Date: Tue, 7 Aug 2012 15:16:53 +0000 (+0000)
Subject: Fix merge prop
X-Git-Tag: certified/1.8.15-cert1-rc1~3^2~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cb5952026033d29e7e9980c68373a406ee7e57a;p=thirdparty%2Fasterisk.git

Fix merge prop

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