Merge tag 'upstream/3.001.012'
authorgregor herrmann <gregoa@debian.org>
Sat, 16 Aug 2014 00:02:59 +0000 (02:02 +0200)
committergregor herrmann <gregoa@debian.org>
Sat, 16 Aug 2014 00:02:59 +0000 (02:02 +0200)
Upstream version 3.001.012


Trivial merge