projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 45edb2c 3383ebb)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 21 Nov 2011 15:16:30 +0000 (11:16 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 21 Nov 2011 15:16:30 +0000 (11:16 -0400)

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