]> xenbits.xensource.com Git - people/iwj/osstest.git/commitdiff
Merge branch 'wip.interfaces' of mariner.not:/u/iwj/work/testing into wip.interfaces
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 6 Feb 2013 12:41:31 +0000 (12:41 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 6 Feb 2013 12:41:31 +0000 (12:41 +0000)
1  2 
Osstest/Debian.pm
ts-host-install

Simple merge
diff --cc ts-host-install
Simple merge