Merge tag 'upstream/1.1+dfsg.1'
commit422e4228936db78b46026d5efa3abafd5f61d794
authorBen Finney <ben+debian@benfinney.id.au>
Wed, 6 Jul 2016 13:46:59 +0000 (6 23:46 +1000)
committerBen Finney <ben+debian@benfinney.id.au>
Wed, 6 Jul 2016 13:46:59 +0000 (6 23:46 +1000)
treebcfb3833ed17a2ba5e4ffbfbcc82b31725f2fe3b
parent915fac00db02264af4f43a0da63a99bf07c72527
parent27ac2753f95c4539e6a559a454cc75566fb69dd9
Merge tag 'upstream/1.1+dfsg.1'

Upstream version 1.1+dfsg.1

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