projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d0bd308 fdf3b7c)
Merge branch 'master' into autoconfig
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 25 Jul 2008 23:41:20 +0000 (19:41 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 25 Jul 2008 23:41:20 +0000 (19:41 -0400)

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