Merge tag 'upstream/10.22'
authorMatthew Vernon <matthew@debian.org>
Tue, 2 Aug 2016 17:57:39 +0000 (18:57 +0100)
committerMatthew Vernon <matthew@debian.org>
Tue, 2 Aug 2016 17:57:39 +0000 (18:57 +0100)
commit7d64d4a94b6b9efeae86c7e4305d4233988c2783
treee61715479eba66d9b79d98fcae14aa706a072f12
parentb53574bf91a1304f1b2476c0ec731356cd1fe773
parent92b17f0eb8fddd7117c5344a1e1177daec21995a
Merge tag 'upstream/10.22'

Upstream version 10.22