Merge tag 'upstream/3.001'
authorgregor herrmann <gregoa@debian.org>
Fri, 6 Jun 2014 10:59:34 +0000 (12:59 +0200)
committergregor herrmann <gregoa@debian.org>
Fri, 6 Jun 2014 10:59:34 +0000 (12:59 +0200)
Upstream version 3.001


Trivial merge