Merge tag 'upstream/2.9r+ds' into experimental
authorgregor herrmann <gregoa@debian.org>
Mon, 17 Dec 2012 19:05:17 +0000 (20:05 +0100)
committergregor herrmann <gregoa@debian.org>
Mon, 17 Dec 2012 19:05:17 +0000 (20:05 +0100)
commit43a2487936d5b5953d1a2b4826106344151c6bb9
treea72d99c83d0eff64c4044e24423adb86ee0bab5a
parent35564cfcbee9a0b195df44829a1e816ba029fedc
parent91cec18e8d01bb0dff8c3d6db96182c51ce1c80a
Merge tag 'upstream/2.9r+ds' into experimental

Upstream version 2.9r+ds

Conflicts:
build.number

--> removed