tree 27e0d96c4da1dc380aa3ed5b2d510cb2ed6fefde
parent dc55bae8d5475a6d7a8b0456416b2422bf9b512d
parent f73db06c09ae3480b3d76a2bba8700444d00f181
author Sebastian Dröge <sebastian.droege@collabora.co.uk> 1348496851 +0200
committer Sebastian Dröge <sebastian.droege@collabora.co.uk> 1348496851 +0200

Merge tag 'upstream/1.0.0'

Upstream version 1.0.0