projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ff23d3 97b2345)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 7 Dec 2011 18:56:30 +0000 (14:56 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 7 Dec 2011 18:56:30 +0000 (14:56 -0400)

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