projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a69d628 1846bd3)
Merge branch 'master' of git://github.com/joeyh/ikiwiki
authorAmitai Schlair <schmonz@magnetic-babysitter.(none)>
Fri, 11 Sep 2009 21:03:41 +0000 (17:03 -0400)
committerAmitai Schlair <schmonz@magnetic-babysitter.(none)>
Fri, 11 Sep 2009 21:03:41 +0000 (17:03 -0400)

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