Merge tag 'upstream/3.001.011'
authorgregor herrmann <gregoa@debian.org>
Tue, 12 Aug 2014 19:11:12 +0000 (21:11 +0200)
committergregor herrmann <gregoa@debian.org>
Tue, 12 Aug 2014 19:11:12 +0000 (21:11 +0200)
Upstream version 3.001.011


Trivial merge