tree 12274e7a8686bc77b93c2656ea7f82316aae3f29
parent 665a1c78c570b54e43ff6bdbee7a58e64bb99fa0
parent e9c66bffc089df63904377cb88002300086e6440
author Sebastian Dröge <sebastian.droege@collabora.co.uk> 1347951012 +0200
committer Sebastian Dröge <sebastian.droege@collabora.co.uk> 1347951012 +0200

Merge tag 'upstream/0.11.99'

Upstream version 0.11.99