tree 38fa97ff8869afdea33eabe6640db9bbff3b06ba
parent 87c4a7c002479481ecdac5c4bc4a5e21a4244316
parent 8421cfdca94795cdb6513d3d6c38abd3a416373b
author Sebastian Dröge <sebastian.droege@collabora.co.uk> 1351164105 +0200
committer Sebastian Dröge <sebastian.droege@collabora.co.uk> 1351164105 +0200

Merge tag 'upstream/1.0.2'

Upstream version 1.0.2