From 0f58d0e1f8339c48ed496e8a306e20994d227886 Mon Sep 17 00:00:00 2001
From: Steve Murphy <murf@digium.com>
Date: Mon, 20 Nov 2006 14:08:04 +0000
Subject: [PATCH] Erased the svnmerge-integrated prop from trunk. Please, in
 your svnmerge-ings, don't let these props leak into the trunk or branches.

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