projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d336d18 ade49d1)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 3 Jun 2011 16:17:49 +0000 (12:17 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 3 Jun 2011 16:17:49 +0000 (12:17 -0400)

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