projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe58241 46a98c8)
Merge branch 'master' into revert
authorJoey Hess <joey@kitenet.net>
Tue, 5 Oct 2010 15:29:44 +0000 (11:29 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 5 Oct 2010 15:29:44 +0000 (11:29 -0400)
Conflicts:
doc/todo/web_reversion.mdwn


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