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