From: gregor herrmann <gregoa@debian.org>
Date: Wed, 12 Jan 2011 23:11:47 +0000 (+0100)
Subject: Merge branch 'master' into gregoa
X-Git-Url: https://git.toastfreeware.priv.at/gregoa/bti.git/commitdiff_plain/265cb514ec1ec84872929a9182c9091b73009272?hp=2557d9168ac942c9cdcf7c0c5d5f76d628c80939

Merge branch 'master' into gregoa
---