tree 95b84bc3f743dad50f4e2752264199fc8028e7fd
parent 0252f6565661fd7c7a66d80773b01840a02cb1c1
parent 9292051a9fb70dea5eb7e542246e8b296e2334fa
author Sebastian Dröge <sebastian.droege@collabora.co.uk> 1353505766 +0100
committer Sebastian Dröge <sebastian.droege@collabora.co.uk> 1353505766 +0100

Merge tag 'upstream/1.0.3'

Upstream version 1.0.3