Merge tag 'upstream/3.008'
authorgregor herrmann <gregoa@debian.org>
Sun, 29 Nov 2015 14:04:25 +0000 (15:04 +0100)
committergregor herrmann <gregoa@debian.org>
Sun, 29 Nov 2015 14:04:25 +0000 (15:04 +0100)
commitc54972887093b8ce8084bdb9af108e94154a7d04
tree7a1ead6b0e1e5cbafff3b9460476e471a994f114
parent1567cbf2e95917cc9821b74b28e9b73aa51ae6a3
parent0b784a6d5ca047063ff50de0ee389b38a6bbd80b
Merge tag 'upstream/3.008'

Upstream version 3.008