tree 4dd2ef067deceaafe3d8044ac3251603fafe2655
parent 8da13aba5da2aeb3b848498857fd8f95059424c5
parent ffcf74985688e7c3dd41d011714981d36740a481
author Sebastian Dröge <sebastian.droege@collabora.co.uk> 1366977955 +0200
committer Sebastian Dröge <sebastian.droege@collabora.co.uk> 1366977955 +0200

Merge tag 'upstream/1.0.7'

Upstream version 1.0.7