tree 6e7f0aafc83a1ee108e902202db5f161b5e3316c
parent d571fcdcf3546e47cf6f7edbe12d60964ace6dc2
parent 0b72df8e58c07cf364c6d81a32077771efdcdebd
author Sebastian Dröge <sebastian.droege@collabora.co.uk> 1363972475 +0100
committer Sebastian Dröge <sebastian.droege@collabora.co.uk> 1363972475 +0100

Merge tag 'upstream/1.0.6'

Upstream version 1.0.6