Merge tag 'upstream/3.001.005'
authorgregor herrmann <gregoa@debian.org>
Mon, 28 Jul 2014 14:31:41 +0000 (16:31 +0200)
committergregor herrmann <gregoa@debian.org>
Mon, 28 Jul 2014 14:31:41 +0000 (16:31 +0200)
Upstream version 3.001.005


Trivial merge