tree 6b0bc14d2bb532dda849b32514efb11298a3383d
parent f3d6ae26c55395bef9d503a6db2454fdbd09b269
parent 33ee1e5933d2a2bb0a5a0e8bd12ad2a1b9cc27a5
author Sebastian Dröge <sebastian.droege@collabora.co.uk> 1353505452 +0100
committer Sebastian Dröge <sebastian.droege@collabora.co.uk> 1353505452 +0100

Merge tag 'upstream/1.0.3'

Upstream version 1.0.3