Merge tag 'upstream/2.2.31'
authorAndreas Tille <tille@debian.org>
Tue, 12 Apr 2016 10:45:52 +0000 (12:45 +0200)
committerAndreas Tille <tille@debian.org>
Tue, 12 Apr 2016 10:45:52 +0000 (12:45 +0200)
Upstream version 2.2.31


Trivial merge