chiark / gitweb /
~ijackson / ypp-sc-tools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f276a86 eaaf421)
Merge branch 'master' of ../ypp-sc-tools
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 12 Jun 2012 00:23:45 +0000 (01:23 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 12 Jun 2012 00:23:45 +0000 (01:23 +0100)

Trivial merge
ypp-sc-tools main public tree