From: Jason Parker <jparker@digium.com>
Date: Mon, 3 May 2010 17:49:52 +0000 (+0000)
Subject: Fix merge props
X-Git-Tag: 1.6.1.20-rc1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a095bdc3b5cb4c2c425b2cbc8436ed3ca5e8b341;p=thirdparty%2Fasterisk.git

Fix merge props

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