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)
commite429d046692d8d110f653789a66a89f9424ed380
treed68aa878192fded42f26d29f3d8ea72f68f51737
parent5e4a0002cf0926e058168a85036998ec2e42bda9
parent5a7eec3ce8d33436788c9bc7f0006ac0b07c6d63
Merge tag 'upstream/3.001.012'

Upstream version 3.001.012