Merge tag 'upstream/2.9.2+ds' into experimental
authorgregor herrmann <gregoa@debian.org>
Mon, 14 Jan 2013 16:32:25 +0000 (17:32 +0100)
committergregor herrmann <gregoa@debian.org>
Mon, 14 Jan 2013 16:32:25 +0000 (17:32 +0100)
commit21f0dd6885ed4243b1f68662b503296d11fdf6a5
treec1eb3b213cf192f460b42b1005d13ea283eb48af
parentafd23cea303575f603aba8a20142c9fe1e263b5b
parent8eb1b9bf2d0747644108c13632fb1244e11712b0
Merge tag 'upstream/2.9.2+ds' into experimental

Upstream version 2.9.2+ds