projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1620e2d 3fd58fc)
Merge branch 'joey' into revert
authorPeter Gammie <peteg42@gmail.com>
Sat, 2 Oct 2010 05:06:10 +0000 (15:06 +1000)
committerPeter Gammie <peteg42@gmail.com>
Sat, 2 Oct 2010 05:06:10 +0000 (15:06 +1000)

Trivial merge
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.