projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9dc2c6 b5bc0e8)
Merge branch 'master' into tova
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 30 Sep 2008 20:35:44 +0000 (16:35 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 30 Sep 2008 20:35:44 +0000 (16:35 -0400)

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