projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c22e0f 70a7b08)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 10 Oct 2012 14:45:38 +0000 (10:45 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 10 Oct 2012 14:45:38 +0000 (10:45 -0400)

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