tree 1e7dc5a85e7b36e89dbc1a5d3cc5cc3833c58209
parent 0acd9ab226f809660208ff025c826a3ee22d487d
parent f4e033e836d36ee95103886032932bf823db5e3f
author Sebastian Dröge <sebastian.droege@collabora.co.uk> 1349683078 +0200
committer Sebastian Dröge <sebastian.droege@collabora.co.uk> 1349683078 +0200

Merge tag 'upstream/1.0.1'

Upstream version 1.0.1