Merge tag 'upstream/033'
authorgregor herrmann <gregoa@debian.org>
Thu, 27 Jun 2013 22:37:17 +0000 (00:37 +0200)
committergregor herrmann <gregoa@debian.org>
Thu, 27 Jun 2013 22:37:17 +0000 (00:37 +0200)
commit05bebc0c876aed7bb534275d94cc90b09939b42f
tree5e3a2164a1a95308fae87fb378434667821e61cc
parent7ed409ef43c79b052442146492b43c6249d431f0
parente4a7b3e19f2aa7ff6b3d2e1a7e9ad81b8c8002cb
Merge tag 'upstream/033'

Upstream version 033

Conflicts:
bti.1
bti.xml