projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 107583f 6ebb4e2)
Merge branch 'tova'
authorJoey Hess <joey@kitenet.net>
Thu, 16 Jun 2011 17:05:05 +0000 (13:05 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 16 Jun 2011 17:05:05 +0000 (13:05 -0400)

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