From: gregor herrmann <gregoa@debian.org>
Date: Wed, 15 Jan 2014 17:13:55 +0000 (+0100)
Subject: Merge tag 'upstream/034'
X-Git-Tag: debian/034-1~8
X-Git-Url: https://git.toastfreeware.priv.at/debian/bti.git/commitdiff_plain/ef3287017985d401cce911fc14fcb2730136364f

Merge tag 'upstream/034'

Upstream version 034

Conflicts:
	bti.1
---

ef3287017985d401cce911fc14fcb2730136364f