Merge tag 'upstream/3.001.002'
authorgregor herrmann <gregoa@debian.org>
Mon, 14 Jul 2014 15:05:37 +0000 (17:05 +0200)
committergregor herrmann <gregoa@debian.org>
Mon, 14 Jul 2014 15:05:37 +0000 (17:05 +0200)
Upstream version 3.001.002


Trivial merge