Merge tag 'upstream/3.003'
authorgregor herrmann <gregoa@debian.org>
Mon, 20 Oct 2014 16:18:47 +0000 (18:18 +0200)
committergregor herrmann <gregoa@debian.org>
Mon, 20 Oct 2014 16:18:47 +0000 (18:18 +0200)
Upstream version 3.003


Trivial merge