tree e2752a3933fa53aaada71380834a977023f629e1
parent 583dc5666e8b18a105ae5b7079e36a63f0af0fda
parent d475181213e1c00541b13625f812aef466e40854
author Sebastian Dröge <slomo@circular-chaos.org> 1376642745 +0200
committer Sebastian Dröge <slomo@circular-chaos.org> 1376642745 +0200

Merge tag 'upstream/1.0.9'

Upstream version 1.0.9