projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41efa5a 1f43a4f)
Merge branch 'master' into comments
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 12 Dec 2008 19:24:35 +0000 (14:24 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 12 Dec 2008 19:24:35 +0000 (14:24 -0500)

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