Merge tag 'upstream/2.9_beta1+ds' into experimental
authorgregor herrmann <gregoa@debian.org>
Mon, 29 Oct 2012 17:49:59 +0000 (18:49 +0100)
committergregor herrmann <gregoa@debian.org>
Mon, 29 Oct 2012 17:49:59 +0000 (18:49 +0100)
commit1e99ad5d529af60b3b480608454d80ab2c909647
treefcb41a18c2da0f7da03aa3aa16344bcef687cde4
parent5fa3ef3686af4da224159ecf0ab9e5af4279cbb0
parentca8bcc0d1ac6800db139751c8eb7508a2214a0ef
Merge tag 'upstream/2.9_beta1+ds' into experimental

Upstream version 2.9~beta1+ds

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

(removed)