Merge tag 'upstream/3.001.007'
authorgregor herrmann <gregoa@debian.org>
Mon, 4 Aug 2014 22:28:27 +0000 (00:28 +0200)
committergregor herrmann <gregoa@debian.org>
Mon, 4 Aug 2014 22:28:27 +0000 (00:28 +0200)
Upstream version 3.001.007


Trivial merge