projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5eb540 a8761a0)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 10 Apr 2010 22:29:20 +0000 (18:29 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 10 Apr 2010 22:29:20 +0000 (18:29 -0400)

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