Merge tag 'upstream/2.11_beta1+ds'
authorgregor herrmann <gregoa@debian.org>
Tue, 19 May 2015 17:39:49 +0000 (19:39 +0200)
committergregor herrmann <gregoa@debian.org>
Tue, 19 May 2015 17:39:49 +0000 (19:39 +0200)
Upstream version 2.11~beta1+ds


Trivial merge