projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c137ef3 db0dea3)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 19 Aug 2012 00:56:40 +0000 (17:56 -0700)
committerJoey Hess <joey@kitenet.net>
Sun, 19 Aug 2012 00:56:40 +0000 (17:56 -0700)

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