Merge tag 'upstream/2.11_beta3+ds'
authorgregor herrmann <gregoa@debian.org>
Thu, 9 Jul 2015 16:53:52 +0000 (18:53 +0200)
committergregor herrmann <gregoa@debian.org>
Thu, 9 Jul 2015 16:53:52 +0000 (18:53 +0200)
Upstream version 2.11~beta3+ds


Trivial merge