projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ceae17 378cae1)
Merge branch 'master' of file:///srv/git/ikiwiki.info
authorJoey Hess <joey@finch.kitenet.net>
Tue, 11 May 2010 21:52:39 +0000 (21:52 +0000)
committerJoey Hess <joey@finch.kitenet.net>
Tue, 11 May 2010 21:52:39 +0000 (21:52 +0000)

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