projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 522b24a d6b7654)
Merge remote-tracking branch 'schmonz/cvs'
authorJoey Hess <joey@kitenet.net>
Mon, 30 Jan 2012 18:35:03 +0000 (14:35 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 30 Jan 2012 18:35:03 +0000 (14:35 -0400)

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