remove another broken property merge
authorKevin P. Fleming <kpfleming@digium.com>
Tue, 7 Nov 2006 14:25:00 +0000 (14:25 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Tue, 7 Nov 2006 14:25:00 +0000 (14:25 +0000)
commit15678d4c8602ca598bc8caec75826c5ccf6ec76a
tree7d9b2a7702f0c29a2b91ae532edc5929fe1cb305
parentb3d2d4c494f6b58b8928cc6a3073da4bda99a8c8
remove another broken property merge

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