projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 941755e e65ce4f)
Merge branch 'joey' into revert
authorPeter Gammie <peteg42@gmail.com>
Thu, 30 Sep 2010 06:13:56 +0000 (16:13 +1000)
committerPeter Gammie <peteg42@gmail.com>
Thu, 30 Sep 2010 06:13:56 +0000 (16:13 +1000)

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