projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25ea99b 1fe773e)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 20 Jul 2012 16:57:37 +0000 (12:57 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 20 Jul 2012 16:57:37 +0000 (12:57 -0400)

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