]> xenbits.xensource.com Git - people/liuw/osstest.git/commitdiff
Merge remote-tracking branch 'cam/production'
authorIan Jackson <ian.jackson@eu.citrix.com>
Tue, 12 May 2015 12:36:27 +0000 (13:36 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 12 May 2015 12:36:27 +0000 (13:36 +0100)

Trivial merge