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)
commit7c815e38d4fbdbdc6ae29f1e2f6d405ac1f40154
tree920824a19a474ef6263f81aea1088f6647a33463
parentb660d8a91518556faa134557d6bae063ca168945
parent286669bdf3065988249dd5cbad3e86153985b38b
Merge tag 'upstream/2.11_beta2+ds'

Upstream version 2.11~beta2+ds