projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 094af3d 534f714)
Merge branch 'master' into git-anon
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 23 Oct 2008 17:45:42 +0000 (13:45 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 23 Oct 2008 17:45:42 +0000 (13:45 -0400)

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