Merge branch 'master' of git.debian.org:/git/bts-link/bts-link
authorPierre Habouzit <pierre.habouzit@m4x.org>
Wed, 20 Jun 2007 19:59:12 +0000 (21:59 +0200)
committerPierre Habouzit <pierre.habouzit@m4x.org>
Wed, 20 Jun 2007 19:59:12 +0000 (21:59 +0200)
1  2 
btslink.cfg

diff --cc btslink.cfg
Simple merge