projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cab1ac7 8a45362)
Merge branch 'master' into autoconfig
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 26 Jul 2008 19:49:08 +0000 (15:49 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 26 Jul 2008 19:49:08 +0000 (15:49 -0400)

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