tree ce44cae509e1cc9319419c619ceef8545a07aadf
parent 378b98189585485842576f33e3d2bd52a65c95ee
parent 35f173479e3f4da3631b3af47c6ad08cac256fb4
author Sebastian Dröge <slomo@circular-chaos.org> 1377853162 +0200
committer Sebastian Dröge <slomo@circular-chaos.org> 1377853162 +0200

Merge tag 'upstream/1.0.10'

Upstream version 1.0.10