projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec22626 a65512a)
Merge remote-tracking branch 'schmonz/cvs'
authorJoey Hess <joey@kitenet.net>
Thu, 2 Feb 2012 05:11:45 +0000 (01:11 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 2 Feb 2012 05:11:45 +0000 (01:11 -0400)

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