projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2717d97 e3304d2)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 13 Feb 2012 15:43:39 +0000 (11:43 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 13 Feb 2012 15:43:39 +0000 (11:43 -0400)

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