Merge tag 'upstream/3.006'
authorgregor herrmann <gregoa@debian.org>
Mon, 16 Nov 2015 20:51:59 +0000 (21:51 +0100)
committergregor herrmann <gregoa@debian.org>
Mon, 16 Nov 2015 20:51:59 +0000 (21:51 +0100)
commit793ad0380c0a6c441970c348bd2af6af01016cb3
treef7549b76f95726b50d584f30a7804c22a46dda6b
parentbdbd9f2dcb4a15a3069bc25c2b86a2b8e6529e1e
parent50863850f15b9d711a053dd1b8e1625cb0fe4805
Merge tag 'upstream/3.006'

Upstream version 3.006