Merge tag 'upstream/034'
authorgregor herrmann <gregoa@debian.org>
Wed, 15 Jan 2014 17:13:55 +0000 (18:13 +0100)
committergregor herrmann <gregoa@debian.org>
Wed, 15 Jan 2014 17:13:55 +0000 (18:13 +0100)
Upstream version 034

Conflicts:
bti.1


Trivial merge