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)
commitd0afd146473fdc4dbad2d2264385d2b42d2a03d6
tree35584d55e11bcb9f001dc6a98ce525f146f8cc11
parenta5479d403266f4887260786223a852606ae9c99d
parent46acfd59d1d04360360e032c9afd0377ac55ee9e
Merge tag 'upstream/2.11_beta1+ds'

Upstream version 2.11~beta1+ds