tree a33cdac44ca281a03961b3f8ffb28a781572bd47
parent 7be55d52c7d36b133830029bf28163e32c07307c
parent c8822ebee301ac67e1f65f39bc85366682e186ba
author Sebastian Dröge <sebastian.droege@collabora.co.uk> 1366977854 +0200
committer Sebastian Dröge <sebastian.droege@collabora.co.uk> 1366977854 +0200

Merge tag 'upstream/1.0.7'

Upstream version 1.0.7