projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d79cf37 21239db)
Merge branch 'master' of git://github.com/joeyh/ikiwiki
authorAmitai Schlair <schmonz@magnetic-babysitter.(none)>
Fri, 4 Sep 2009 20:02:58 +0000 (15:02 -0500)
committerAmitai Schlair <schmonz@magnetic-babysitter.(none)>
Fri, 4 Sep 2009 20:02:58 +0000 (15:02 -0500)

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