tree eb6c5923a7024e7ef76dd6b47b7f68b1a74e51de
parent 46d513657aeec53107f086bbcdc6eed84d99a439
parent bed72dff4210fac83b878ac3b0f3ecb78d30d1d2
author Sebastian Dröge <sebastian.droege@collabora.co.uk> 1339139842 +0200
committer Sebastian Dröge <sebastian.droege@collabora.co.uk> 1339139842 +0200

Merge tag 'upstream/0.11.92'

Upstream version 0.11.92