Merge tag 'upstream/2.9_beta2+ds' into experimental
authorgregor herrmann <gregoa@debian.org>
Mon, 19 Nov 2012 15:44:53 +0000 (16:44 +0100)
committergregor herrmann <gregoa@debian.org>
Mon, 19 Nov 2012 15:44:53 +0000 (16:44 +0100)
Upstream version 2.9~beta2+ds

Conflicts:
build.number
src/resource/build.properties

-> removed


Trivial merge