Merge tag 'upstream/2.11_beta2+ds'
authorgregor herrmann <gregoa@debian.org>
Wed, 20 May 2015 15:49:35 +0000 (17:49 +0200)
committergregor herrmann <gregoa@debian.org>
Wed, 20 May 2015 15:49:35 +0000 (17:49 +0200)
Upstream version 2.11~beta2+ds


Trivial merge