projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e1806e 04af2f9)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 8 Apr 2012 18:17:29 +0000 (14:17 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 8 Apr 2012 18:17:29 +0000 (14:17 -0400)

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