projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f95e9b 99eec4f)
Merge branch 'master' into dependency-types
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 12 Oct 2009 00:00:12 +0000 (20:00 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 12 Oct 2009 00:00:12 +0000 (20:00 -0400)

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