projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f8cc87e c53a3a1)
Merge branch 'master' into comments
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 21 Dec 2008 06:04:03 +0000 (01:04 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 21 Dec 2008 06:04:03 +0000 (01:04 -0500)

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