projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3436fed e30b96b)
Merge branch 'master' into recentchanges
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 29 Jan 2008 02:24:15 +0000 (21:24 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 29 Jan 2008 02:24:15 +0000 (21:24 -0500)

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