Merge tag 'upstream/3.001.003'
authorgregor herrmann <gregoa@debian.org>
Tue, 15 Jul 2014 14:21:23 +0000 (16:21 +0200)
committergregor herrmann <gregoa@debian.org>
Tue, 15 Jul 2014 14:21:23 +0000 (16:21 +0200)
Upstream version 3.001.003


Trivial merge