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=55422fe541ed11a4938b557b2665766f89b68e1f;hp=4e3c7e7697663dd3b9ab5e5744e86dc7a530f8e9;p=pkg%2Ft-prot.git

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