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)
commitef3287017985d401cce911fc14fcb2730136364f
treee1769e4bf45edf00a408ba923dd42f6523815f10
parent7e974e21e9a7478ee7ff2011dd76ad30b4a52cb8
parentc847c253c82994816575564d364690addcddff8e
Merge tag 'upstream/034'

Upstream version 034

Conflicts:
bti.1