projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 52134dc cda8592)
Merge branch 'master' into transitive-dependencies
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 4 Oct 2009 20:28:57 +0000 (16:28 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 4 Oct 2009 20:28:57 +0000 (16:28 -0400)

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