Merge commit 'jv/launchpad'
authorPierre Habouzit <madcoder@debian.org>
Sat, 17 May 2008 15:52:18 +0000 (17:52 +0200)
committerPierre Habouzit <madcoder@debian.org>
Sat, 17 May 2008 15:52:18 +0000 (17:52 +0200)
1  2 
btslink.cfg

diff --cc btslink.cfg
Simple merge