From: Kevin P. Fleming <kpfleming@digium.com>
Date: Tue, 7 Nov 2006 14:25:00 +0000 (+0000)
Subject: remove another broken property merge
X-Git-Tag: 1.6.0-beta1~3^2~4097
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15678d4c8602ca598bc8caec75826c5ccf6ec76a;p=thirdparty%2Fasterisk.git

remove another broken property merge


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