From: gregor herrmann <gregoa@debian.org>
Date: Fri, 17 Dec 2010 00:56:24 +0000 (+0100)
Subject: Merge branch 'master' into gregoa
X-Git-Url: https://git.toastfreeware.priv.at/gregoa/bti.git/commitdiff_plain/3f0e7d450ba6dca015a6b541a004c826fd0ac556?hp=af4c95e5d392338d8b10d866e75ffd6c744531fa

Merge branch 'master' into gregoa
---