projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f4d1f6f 2fedc70)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 27 Sep 2012 23:03:20 +0000 (19:03 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 27 Sep 2012 23:03:20 +0000 (19:03 -0400)

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