Merge tag 'upstream/2.3'
authorgregor herrmann <gregoa@debian.org>
Tue, 30 Aug 2016 16:47:47 +0000 (18:47 +0200)
committergregor herrmann <gregoa@debian.org>
Tue, 30 Aug 2016 16:47:47 +0000 (18:47 +0200)
commit09939e2b450e39e5e34d6035e9f68ea5e9d69645
tree871f1747235027cd5b974994a553c0f3a5bb2e68
parent54861ab90021bb7763357a4c5442c3a4da185928
parent5b3257b12d3ab13c52d8a8e6dd2a78de1b68d9d6
Merge tag 'upstream/2.3'

Upstream version 2.3