From 445abea012b7ccabea159ffac212665edb3a96cc Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Tue, 23 Jan 2007 01:51:22 +0000
Subject: [PATCH] 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
-- 
GitLab