projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a24c0c5 ac5164d)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 3 Jun 2011 15:29:26 +0000 (11:29 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 3 Jun 2011 15:29:26 +0000 (11:29 -0400)

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