tree 41c5efae2c5ca524dc27d77222934659f25dc342
parent 8db20b235c48ce02741cbee20751522e3b239109
parent 0dae307117a84152263d4c8b2c6aacf7e98a2f7c
author Sebastian Dröge <sebastian.droege@collabora.co.uk> 1357648643 +0100
committer Sebastian Dröge <sebastian.droege@collabora.co.uk> 1357648643 +0100

Merge tag 'upstream/1.0.5'

Upstream version 1.0.5