projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 3b0aa2f 5c669ab)
Merge branch 'comments'
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 21 Dec 2008 17:48:14 +0000 (12:48 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 21 Dec 2008 17:48:14 +0000 (12:48 -0500)

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