tree 266ecd353dfeeab1fcef367520d6c5cb807e26c2
parent 1dd44f399262ef3896e8d247069fb304d6b00461
parent 527b34cfbd859fccf6ee49024abdef526fd00674
author Sebastian Dröge <slomo@circular-chaos.org> 1377852939 +0200
committer Sebastian Dröge <slomo@circular-chaos.org> 1377852939 +0200

Merge tag 'upstream/1.0.10'

Upstream version 1.0.10