From: Axel Beckert <abe@deuxchevaux.org>
Date: Mon, 25 Aug 2014 11:17:26 +0000 (+0200)
Subject: Merge tag 'upstream/3.2'
X-Git-Tag: debian/3.2-1~2
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=7c4bc6c5cafd01d3683277687590c226a0d2b619;p=pkg%2Ft-prot.git

Merge tag 'upstream/3.2'

Upstream version 3.2

# gpg: Signature made Mon 25 Aug 2014 01:17:21 PM CEST using DSA key ID 95930EDE
# gpg: please do a --check-trustdb
# gpg: Good signature from "Axel Beckert (no legal relevance) <abe@deuxchevaux.org>"
# gpg:                 aka "Axel Beckert (no legal relevance) <abe@noone.org>"
# gpg:                 aka "Axel Beckert (no legal relevance) <xtaran@symlink.ch>"
# gpg:                 aka "Axel Beckert (FSFE Fellow) <abe@fsfe.org>"
# gpg:                 aka "Axel Beckert (Debian Developer) <abe@debian.org>"
---

7c4bc6c5cafd01d3683277687590c226a0d2b619