From: Jason Parker <jparker@digium.com>
Date: Mon, 11 Jun 2012 22:49:18 +0000 (+0000)
Subject: Fix merge prop.
X-Git-Tag: 10.6.0-digiumphones-rc1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9d325e8c94ecfd01dd4b96f9fba0c838e6b1d7e;p=thirdparty%2Fasterisk.git

Fix merge prop.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@368783 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---