]> xenbits.xensource.com Git - people/royger/osstest.git/commitdiff
Merge remote-tracking branch 'iwj/master' into wip
authorIan Jackson <ian.jackson@eu.citrix.com>
Tue, 12 Jun 2018 17:52:21 +0000 (18:52 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 12 Jun 2018 17:52:21 +0000 (18:52 +0100)

Trivial merge