tree 43f0c96fdd546c0bbe708cca80a9103130cd22d3
parent c2c036471f555fb874df8aa1fb4a5f42406ac4d4
parent 09825ae4feb66a77032835b4c259beb26e322ecb
author Sebastian Dröge <sebastian.droege@collabora.co.uk> 1353506120 +0100
committer Sebastian Dröge <sebastian.droege@collabora.co.uk> 1353506120 +0100

Merge tag 'upstream/1.0.3'

Upstream version 1.0.3