setup merge tracking
authorKevin P. Fleming <kpfleming@digium.com>
Wed, 20 Sep 2006 21:47:22 +0000 (21:47 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Wed, 20 Sep 2006 21:47:22 +0000 (21:47 +0000)
commit9a147c678c6dbd30c7b78417d977aedb7e1ee80a
tree7cc97571b4851921e321ccbabb6efcffa6230883
parent28ffdcc783e79cf8443eeb63e57376aeb8ea5e1f
setup merge tracking

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