]> xenbits.xensource.com Git - people/iwj/osstest.git/commitdiff
Merge branch 'for-ianc' of git://xenbits.xen.org/people/liuw/osstest
authorIan Campbell <ian.campbell@citrix.com>
Thu, 19 Sep 2013 15:34:30 +0000 (16:34 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Thu, 19 Sep 2013 15:34:30 +0000 (16:34 +0100)
1  2 
make-flight
ts-xen-build-prep

diff --cc make-flight
Simple merge
Simple merge