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)
commit3ad9533a3e217f5d6fcb4312b258d04bc16e7873
treec946c9bf6394647fd4e5bd5686b1d9be4e66d2c5
parentf1621cfa254b36ed06ad7f9fc97ec39fb2ed36dd
parentbfbea3a0b169611915f49cbec0debba34a5c336d
Merge tag 'upstream/2.9+ds' into experimental

Upstream version 2.9+ds

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

--> removed