projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02d9445 b72757b)
Merge remote branch 'smcv/trivia'
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 11 Mar 2010 20:48:47 +0000 (15:48 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 11 Mar 2010 20:48:47 +0000 (15:48 -0500)

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