tree 4a30210e27d50ee0faf34c5021b1ee2c12b3af28
parent 4ac0cee1cf8ad2d7304e0ef42ef592ab008f7f70
parent bc05d9813838021ff5961ae5d5eb25e88a3ab321
author Sebastian Dröge <slomo@circular-chaos.org> 1376643014 +0200
committer Sebastian Dröge <slomo@circular-chaos.org> 1376643014 +0200

Merge tag 'upstream/1.0.9'

Upstream version 1.0.9