tree c8c3fa94839939bf06902b02f94e440a4c8027bc
parent bac7a140f8cff29e66062fdaf05cded2d57debd2
parent e4f7e7387835f2d104054b356866aff3d409e3e0
author Sebastian Dröge <sebastian.droege@collabora.co.uk> 1363972282 +0100
committer Sebastian Dröge <sebastian.droege@collabora.co.uk> 1363972282 +0100

Merge tag 'upstream/1.0.6'

Upstream version 1.0.6