projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6e589c 8b927d4)
Merge commit 'smcv/ready/trivia'
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 28 Aug 2009 18:45:38 +0000 (14:45 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 28 Aug 2009 18:45:38 +0000 (14:45 -0400)

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