projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a02c3f4 d6c73e9)
Merge branch 'master' into tova
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 29 Jul 2008 19:40:23 +0000 (15:40 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 29 Jul 2008 19:40:23 +0000 (15:40 -0400)

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