projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 3a23cdd a8890f5)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 30 May 2008 16:51:11 +0000 (12:51 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 30 May 2008 16:51:11 +0000 (12:51 -0400)

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