Merge tag 'upstream/3.001.006'
authorgregor herrmann <gregoa@debian.org>
Sun, 3 Aug 2014 21:21:35 +0000 (23:21 +0200)
committergregor herrmann <gregoa@debian.org>
Sun, 3 Aug 2014 21:21:35 +0000 (23:21 +0200)
Upstream version 3.001.006


Trivial merge