Merge tag 'upstream/3.009'
authorgregor herrmann <gregoa@debian.org>
Mon, 30 Nov 2015 22:14:44 +0000 (23:14 +0100)
committergregor herrmann <gregoa@debian.org>
Mon, 30 Nov 2015 22:14:44 +0000 (23:14 +0100)
Upstream version 3.009


Trivial merge