tree cea9a8858b801c622feaa51e54814f60b61be2e7
parent 67999ed6fcb2b100128f4b1a143dfbc5c49a9d3d
parent 747315599d26c3d58d30805927934313d3ba0dc5
author Sebastian Dröge <sebastian.droege@collabora.co.uk> 1347953294 +0200
committer Sebastian Dröge <sebastian.droege@collabora.co.uk> 1347953294 +0200

Merge tag 'upstream/0.11.99'

Upstream version 0.11.99