projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c821430 2d99fe0)
Merge branch 'revert'
authorJoey Hess <joey@kitenet.net>
Fri, 8 Oct 2010 23:31:06 +0000 (19:31 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 8 Oct 2010 23:31:06 +0000 (19:31 -0400)

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