]> xenbits.xensource.com Git - people/liuw/osstest.git/commitdiff
Merge remote-tracking branch 'origin/incoming' into wip.colo
authorIan Jackson <ian.jackson@eu.citrix.com>
Thu, 26 Mar 2015 18:49:27 +0000 (18:49 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Thu, 26 Mar 2015 18:49:27 +0000 (18:49 +0000)
1  2 
Osstest/Debian.pm
make-flight

Simple merge
diff --cc make-flight
Simple merge