Merge tag 'upstream/3.001.005'
authorgregor herrmann <gregoa@debian.org>
Mon, 28 Jul 2014 14:31:41 +0000 (16:31 +0200)
committergregor herrmann <gregoa@debian.org>
Mon, 28 Jul 2014 14:31:41 +0000 (16:31 +0200)
commit296d9eb56f89f0557178db66d929af3ea1f1b64d
treecd0608350f0eae178c6228ec06f94fe538ee518f
parent2a75281a0a8919df3b28bee1edf3675cddbb0569
parentd9411fc06f9c4e913279f8b68b2bb168fe7842bc
Merge tag 'upstream/3.001.005'

Upstream version 3.001.005