projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51d8899 7adb471)
Merge branch 'master' into dependency-types
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 11 Oct 2009 23:56:50 +0000 (19:56 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 11 Oct 2009 23:56:50 +0000 (19:56 -0400)

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