projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 73420c2 5a2ffac)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 5 Jan 2010 04:38:59 +0000 (23:38 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 5 Jan 2010 04:38:59 +0000 (23:38 -0500)

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