tree a26128884e8a6351705b84abb1e71a734876af43
parent 4935bca0f8d4914da0e3a8b0c6a9e6a69429bd12
parent b7249e4ba1c7f2821c376d2106361a7460205061
author Sebastian Dröge <slomo@circular-chaos.org> 1376642923 +0200
committer Sebastian Dröge <slomo@circular-chaos.org> 1376642923 +0200

Merge tag 'upstream/1.0.9'

Upstream version 1.0.9