tree 17eb864e55d27808fcd4c6e5d9afcfea6b2ffff3
parent dbf0e6292e0150c8e289c20edfc908f2b2c26738
parent d1f921cf62a353aff4ea4bbb953cd08d6bdc8fc1
author Sebastian Dröge <sebastian.droege@collabora.co.uk> 1344442312 +0200
committer Sebastian Dröge <sebastian.droege@collabora.co.uk> 1344442312 +0200

Merge tag 'upstream/0.11.93'

Upstream version 0.11.93