tree ca3283a59f598cbc4ccde0fa79a2faf18aa08e3e
parent 233dc39153be6e1797b7daca4ee131e7cb3624bd
parent 6b159f1110f647277b11a141a0ce580ecc035f6c
author Sebastian Dröge <sebastian@centricular.com> 1478015640 +0200
committer Sebastian Dröge <sebastian@centricular.com> 1478015640 +0200

Merge tag 'upstream/1.10.0'

Upstream version 1.10.0