Merge tag 'upstream/3.001.004'
authorgregor herrmann <gregoa@debian.org>
Sun, 27 Jul 2014 20:24:16 +0000 (22:24 +0200)
committergregor herrmann <gregoa@debian.org>
Sun, 27 Jul 2014 20:24:16 +0000 (22:24 +0200)
commitb19f96ab0a6c038a99b4fb2759be3e6df25a5f9b
tree125970a9664d2c2d115bb95bbcc8dd562fe86b23
parent8833e9167729061954a185db958a310f426165a5
parent0a6359d7e1e6adde1752c4e0e1dc9c6d2b824179
Merge tag 'upstream/3.001.004'

Upstream version 3.001.004