projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06b28dd 8728a79)
Merge branch 'master' into revert
authorJoey Hess <joey@kitenet.net>
Wed, 6 Oct 2010 18:36:13 +0000 (14:36 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 6 Oct 2010 18:36:13 +0000 (14:36 -0400)

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