projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee9381a f961841)
Merge branch 'master' of file:///srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 5 Sep 2008 16:38:19 +0000 (12:38 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 5 Sep 2008 16:38:19 +0000 (12:38 -0400)

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