projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c21f9e7 786dcf1)
Merge branch 'master' into dependency-types
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 5 Oct 2009 20:47:40 +0000 (16:47 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 5 Oct 2009 20:47:40 +0000 (16:47 -0400)

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