From: Russell Bryant Date: Tue, 19 Jul 2011 21:21:53 +0000 (+0000) Subject: Fix properties after twilson's change so merges still work X-Git-Tag: 11.0.0-beta1~1337 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce291c116c51c629b315bc61ab2896b4a756347d;p=thirdparty%2Fasterisk.git Fix properties after twilson's change so merges still work git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@328877 65c4cc65-6c06-0410-ace0-fbb531ad65f3 ---