projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 65c12df 00327e6)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 22 Aug 2008 02:25:53 +0000 (22:25 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 22 Aug 2008 02:25:53 +0000 (22:25 -0400)

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