projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1942fc3 88e8d4b)
Merge branch 'master' into comments
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 12 Dec 2008 19:21:08 +0000 (14:21 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 12 Dec 2008 19:21:08 +0000 (14:21 -0500)

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