tree fd2f4aed7627eb08a48e5edf8a4a5ecf4e3893b4
parent 6856c2b39436784ed46373ce63af2265c44f6b8f
parent 22246f47faa3da66d48fba16f93d842c7bf3c418
author Sebastian Dröge <sebastian@centricular.com> 1478015041 +0200
committer Sebastian Dröge <sebastian@centricular.com> 1478015041 +0200

Merge tag 'upstream/1.10.0'

Upstream version 1.10.0