projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 142e025 b5e7f7a)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 16 Apr 2010 00:12:25 +0000 (20:12 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 16 Apr 2010 00:12:25 +0000 (20:12 -0400)

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