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)
commit640222947ab60781166efd72da99f3b65f14669e
tree0688198aad97c934239a8fb4874938fc6bd5b261
parent3b56af418c6db79ee96dc7a77e6993c8fd32451d
parentf8d100fb4998554d00caa1e0d9e8a5223b953196
Merge tag 'upstream/2.9_beta2+ds' into experimental

Upstream version 2.9~beta2+ds

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

-> removed