projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c8a4fff 1254e72)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 29 Dec 2011 14:31:23 +0000 (10:31 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 29 Dec 2011 14:31:23 +0000 (10:31 -0400)

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