Merge tag 'upstream/3.001.008'
authorgregor herrmann <gregoa@debian.org>
Tue, 5 Aug 2014 17:27:55 +0000 (19:27 +0200)
committergregor herrmann <gregoa@debian.org>
Tue, 5 Aug 2014 17:27:55 +0000 (19:27 +0200)
Upstream version 3.001.008


Trivial merge