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)
commit42b4d4d7a2e65a052219095f26a46ee7dee461da
treef81250a1379e4cd44d400e253dee3bea018d857d
parent7c815e38d4fbdbdc6ae29f1e2f6d405ac1f40154
parent00fd83e028d57cccd2692fcae3918d90fdcd1894
Merge tag 'upstream/2.11_beta3+ds'

Upstream version 2.11~beta3+ds