Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Fri, 4 Nov 2011 19:46:33 +0000 (20:46 +0100)
committergregor herrmann <gregoa@debian.org>
Fri, 4 Nov 2011 19:46:33 +0000 (20:46 +0100)
1  2 
bti.xml

diff --cc bti.xml
Simple merge