From: Joshua Colp <jcolp@digium.com>
Date: Tue, 23 Jan 2007 01:51:22 +0000 (+0000)
Subject: No more conflicts on properties! svnmerge-block be gone!
X-Git-Tag: 1.6.0-beta1~3^2~3390
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=445abea012b7ccabea159ffac212665edb3a96cc;p=thirdparty%2Fasterisk.git

No more conflicts on properties! svnmerge-block be gone!


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