projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ab88adc 3813632)
Merge branch 'master' of git://github.com/joeyh/ikiwiki
authorAmitai Schlair <schmonz@magnetic-babysitter.Ativa>
Tue, 8 Sep 2009 17:08:49 +0000 (13:08 -0400)
committerAmitai Schlair <schmonz@magnetic-babysitter.Ativa>
Tue, 8 Sep 2009 17:08:49 +0000 (13:08 -0400)

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