From: Axel Beckert <abe@deuxchevaux.org>
Date: Tue, 29 Oct 2013 12:17:13 +0000 (+0100)
Subject: Merge tag 'upstream/3.0'
X-Git-Tag: debian/3.0-1~11
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=530c03b53506fbfffdf6ae4ca56f178a07eb9642;p=pkg%2Ft-prot.git

Merge tag 'upstream/3.0'

Upstream version 3.0

# gpg: Signature made Tue 29 Oct 2013 13:17:05 CET 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>"
---

530c03b53506fbfffdf6ae4ca56f178a07eb9642