From 9a147c678c6dbd30c7b78417d977aedb7e1ee80a Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Wed, 20 Sep 2006 21:47:22 +0000
Subject: [PATCH] setup merge tracking

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