From: Kevin P. Fleming <kpfleming@digium.com>
Date: Wed, 20 Sep 2006 21:47:22 +0000 (+0000)
Subject: setup merge tracking
X-Git-Tag: 1.6.0-beta1~3^2~4710
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a147c678c6dbd30c7b78417d977aedb7e1ee80a;p=thirdparty%2Fasterisk.git

setup merge tracking


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