Merge tag 'upstream/24.0'
authorJoachim Wiedorn <ad_debian@joonet.de>
Sun, 9 Jun 2013 19:14:10 +0000 (21:14 +0200)
committerJoachim Wiedorn <ad_debian@joonet.de>
Sun, 9 Jun 2013 19:14:10 +0000 (21:14 +0200)
commitffed495b68f6d518efc5fcf6e845c5ff83099b11
treef43c2f24b1193a48d4097427b15fec269ceae7ce
parent04dffcb9f6f560975833d0283ccb27ca25081d9e
parentf574e1127a225e2de2e77a6b9e46a65986789f1f
Merge tag 'upstream/24.0'

Upstream version 24.0