Merge tag 'upstream/1.0+dfsg.1'
commit915fac00db02264af4f43a0da63a99bf07c72527
authorBen Finney <ben+debian@benfinney.id.au>
Wed, 6 Jul 2016 13:46:52 +0000 (6 23:46 +1000)
committerBen Finney <ben+debian@benfinney.id.au>
Wed, 6 Jul 2016 13:46:52 +0000 (6 23:46 +1000)
tree885417100cf92c236dcb98d48ff8430817699cff
parente53c4763749cd508d81812a134a12aa3517f966d
parent85cf9fa92ac57cab595fd65545b01acce0a1a06c
Merge tag 'upstream/1.0+dfsg.1'

Upstream version 1.0+dfsg.1

# gpg: Signature made Wed 06 Jul 2016 23:46:52 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/1.0+dfsg.1':
  Import upstream version “1.0+dfsg.1”.