Merge tag 'upstream/3.001.004'
authorgregor herrmann <gregoa@debian.org>
Sun, 27 Jul 2014 20:24:16 +0000 (22:24 +0200)
committergregor herrmann <gregoa@debian.org>
Sun, 27 Jul 2014 20:24:16 +0000 (22:24 +0200)
Upstream version 3.001.004


Trivial merge