projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 94f8264 44ffdd2)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 11 Aug 2012 20:24:11 +0000 (16:24 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 11 Aug 2012 20:24:11 +0000 (16:24 -0400)

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