projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bad3c00 7a89e8c)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 15 Oct 2012 17:54:22 +0000 (13:54 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 15 Oct 2012 17:54:22 +0000 (13:54 -0400)

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