Merge tag 'upstream/2.10_beta2+ds'
authorgregor herrmann <gregoa@debian.org>
Fri, 21 Jun 2013 16:30:38 +0000 (18:30 +0200)
committergregor herrmann <gregoa@debian.org>
Fri, 21 Jun 2013 16:30:38 +0000 (18:30 +0200)
commitb7141ceb174cb3aaa89203ba6f08aae8774d52b0
treef7bb0be05e7866d5622eaed88d38018108422a42
parentecdb86d79e0162c27e0f29fe9c6f1937cbddf5d3
parent0947be71f1e9b86bedc1e9ffdb2401bfbb2e173e
Merge tag 'upstream/2.10_beta2+ds'

Upstream version 2.10~beta2+ds