tree 15cc7c4da671dc2bc259acc6d006ec5348c11235
parent 4d963e49ef86a61428ddc38bff91a0e5619267e4
parent c333dd9bf59b094ecccdf6e263bd1b905ab136e0
author Sebastian Dröge <sebastian.droege@collabora.co.uk> 1351164806 +0200
committer Sebastian Dröge <sebastian.droege@collabora.co.uk> 1351164806 +0200

Merge tag 'upstream/1.0.2'

Upstream version 1.0.2