From: Axel Beckert <abe@deuxchevaux.org>
Date: Sun, 26 Apr 2015 02:47:28 +0000 (+0200)
Subject: Merge branch 'upstream' of git.deb.at:pkg/t-prot into upstream
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=refs%2Fheads%2Fupstream;hp=46d333b0789ea0405191224abbec32bf6bbd26cf;p=pkg%2Ft-prot.git

Merge branch 'upstream' of git.deb.at:pkg/t-prot into upstream
---