Merge tag 'upstream/2.10_beta1+ds' into experimental
authorgregor herrmann <gregoa@debian.org>
Fri, 29 Mar 2013 16:26:09 +0000 (17:26 +0100)
committergregor herrmann <gregoa@debian.org>
Fri, 29 Mar 2013 16:26:09 +0000 (17:26 +0100)
commit849c0a447c7ff046bf5f736221c4296e2ea9a7e6
tree91e3fc1ad4adb74e8423213af539c7a399fd649b
parent8b428907c16ea5829d54e14d6cab965578fb6fb0
parentf6a735efb0054b3d9913e39de34a4e734ee583ac
Merge tag 'upstream/2.10_beta1+ds' into experimental

Upstream version 2.10~beta1+ds