projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c0c4e4 75f538f)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 30 Nov 2011 16:15:39 +0000 (12:15 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 30 Nov 2011 16:15:39 +0000 (12:15 -0400)

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