]> xenbits.xensource.com Git - people/liuw/osstest.git/commitdiff
Merge branch 'from-cambridge/2015-07-13' into master
authorIan Jackson <ian.jackson@eu.citrix.com>
Mon, 13 Jul 2015 17:02:05 +0000 (18:02 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Mon, 13 Jul 2015 17:02:05 +0000 (18:02 +0100)

Trivial merge