projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 79b376f 3690864)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 18 Oct 2008 00:28:24 +0000 (20:28 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 18 Oct 2008 00:28:24 +0000 (20:28 -0400)

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