Merge tag 'upstream/6.12.1_dfsg.1'master
commit05e4f453953be91a7f7fcd74f86b42fc73876687
authorBen Finney <ben+debian@benfinney.id.au>
Mon, 13 Jun 2016 04:25:25 +0000 (13 14:25 +1000)
committerBen Finney <ben+debian@benfinney.id.au>
Mon, 13 Jun 2016 04:25:25 +0000 (13 14:25 +1000)
treed53f0c2f7c2d3b53625d7c84cb5f5ce218212a6d
parent26a8abd118a91f7ea5b597b3ba4b2dd04bd43fdf
parent5efd4f8c966f14f9d19b8418f566a784ab53d0cf
Merge tag 'upstream/6.12.1_dfsg.1'

Upstream version 6.12.1~dfsg.1

# gpg: Signature made Mon 13 Jun 2016 14:25:25 AEST using RSA key ID 65D1F1F7
# gpg: Good signature from "Ben Finney <ben@benfinney.id.au>"
# gpg:                 aka "Ben Finney (White Tree) <bignose@whitetree.org>"
# gpg:                 aka "Ben Finney (Free Software Foundation) <bignose@member.fsf.org>"
# gpg:                 aka "Ben Finney (Debian) <ben+debian@benfinney.id.au>"
# gpg:                 aka "[jpeg image of size 8917]"
# gpg:                 aka "[jpeg image of size 6222]"
# gpg:                 aka "Ben Finney <bignose@whitetree.org>"
# gpg:                 aka "Ben Finney <bignose@member.fsf.org>"
# gpg:                 aka "Ben Finney <ben+debian@benfinney.id.au>"

* tag 'upstream/6.12.1_dfsg.1':
  Imported Upstream version 6.12.1~dfsg.1