projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e3596db 55dc246)
Merge remote-tracking branch 'jonas/master'
authorJoey Hess <joey@kitenet.net>
Fri, 6 May 2011 18:31:59 +0000 (14:31 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 6 May 2011 18:31:59 +0000 (14:31 -0400)

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