Merge tag 'upstream/2.4'
authorgregor herrmann <gregoa@debian.org>
Sun, 27 Nov 2016 18:24:43 +0000 (19:24 +0100)
committergregor herrmann <gregoa@debian.org>
Sun, 27 Nov 2016 18:24:43 +0000 (19:24 +0100)
commitc762789281ba9e60ef858e6b5075e55b40d34b6e
treeec690a7be56c69631cfca85b6ba699570b0753d8
parentbea2733f310dbe7c683c6675b5ffcbc15240903b
parent0a10f2486279ae0d46b51af18d4aa7546343478f
Merge tag 'upstream/2.4'

Upstream version 2.4