tree 030505ce5344274234e56cf57b5321cce46ddbfb
parent 19d036de63fc0902b8a4d76f36f5ebe79b884716
parent d528759e03c7b2092acae3b2bc5d79289da86161
author Sebastian Dröge <sebastian.droege@collabora.co.uk> 1357648779 +0100
committer Sebastian Dröge <sebastian.droege@collabora.co.uk> 1357648779 +0100

Merge tag 'upstream/1.0.5'

Upstream version 1.0.5