]> xenbits.xensource.com Git - people/iwj/osstest.git/commitdiff
Merge branch 'pretest' of /export/home/osstest/testing.git/ into wip
authorIan Jackson <iwj@woking.cam.xci-test.com>
Thu, 12 Sep 2013 14:37:19 +0000 (15:37 +0100)
committerIan Jackson <iwj@woking.cam.xci-test.com>
Thu, 12 Sep 2013 14:37:19 +0000 (15:37 +0100)

Trivial merge