projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ef1f4de 3575798)
Merge commit 'jelmer/master'
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 25 Jul 2008 19:15:39 +0000 (15:15 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 25 Jul 2008 19:15:39 +0000 (15:15 -0400)

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