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)
Upstream version 2.3


Trivial merge