chiark / gitweb /
~ian / userv-utils.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ae8e68 0789c49)
Merge branch 'zealot'
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 20 Aug 2011 16:24:02 +0000 (17:24 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 20 Aug 2011 16:24:02 +0000 (17:24 +0100)
Conflicts:
.gitignore
ipif/Makefile


Trivial merge
Unnamed repository; edit this file to name it for gitweb.