tree fe9b79a38c4aa0e38d472b7c54d5d18d896bc50a
parent 427ff61c5eb4e91087d7c1df17f4cfd20dbc36a1
parent e0655f96cc7e2ef783f3db82c6b087d34f1e2b87
author Sebastian Dröge <sebastian.droege@collabora.co.uk> 1347606110 +0200
committer Sebastian Dröge <sebastian.droege@collabora.co.uk> 1347606110 +0200

Merge tag 'upstream/0.11.94'

Upstream version 0.11.94