From: Axel Beckert <abe@deuxchevaux.org>
Date: Sun, 26 Apr 2015 02:51:49 +0000 (+0200)
Subject: Merge branch 'master' of git.deb.at:pkg/t-prot
X-Git-Tag: debian/3.4-2~2
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=3d76d3fe8f1ede365de7e60b0e1d97e7c284ec3c;hp=3d76d3fe8f1ede365de7e60b0e1d97e7c284ec3c;p=pkg%2Ft-prot.git

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

Conflicts:
	debian/changelog
---