Merge tag 'upstream/6.12_dfsg.1'
commit94bd876e29bd92dbfdd10e46dbeefbc5a1d2d31a
authorBen Finney <ben+debian@benfinney.id.au>
Sat, 16 Apr 2016 19:35:08 +0000 (17 05:35 +1000)
committerBen Finney <ben+debian@benfinney.id.au>
Sat, 16 Apr 2016 19:35:08 +0000 (17 05:35 +1000)
tree7a265083604d7c66761f5ac844e7ea6773fd697b
parent9568a4cd20335cf97ab9915c85cce0d764f8b09d
parenta4de2f9b5d8c79c4b03aff79bdf393bbd6dd19a6
Merge tag 'upstream/6.12_dfsg.1'

Upstream version 6.12~dfsg.1

# gpg: Signature made Sun 17 Apr 2016 05:35:08 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_dfsg.1':
  Imported Upstream version 6.12~dfsg.1