Merge tag 'upstream/2.9+ds' into experimental
authorgregor herrmann <gregoa@debian.org>
Fri, 14 Dec 2012 16:35:34 +0000 (17:35 +0100)
committergregor herrmann <gregoa@debian.org>
Fri, 14 Dec 2012 16:35:34 +0000 (17:35 +0100)
Upstream version 2.9+ds

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

--> removed


Trivial merge