tree b7f31bf34c35fe3001124c15df7fce0ee58bbaad
parent 39395143ebb222bc16e07d9e300ad4a6f9a0578e
parent 5760af31bc01bb39bbb170ca6d4db3168a25fbf2
author Sebastian Dröge <slomo@circular-chaos.org> 1377853078 +0200
committer Sebastian Dröge <slomo@circular-chaos.org> 1377853078 +0200

Merge tag 'upstream/1.0.10'

Upstream version 1.0.10