projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12c9219 130fd91)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 20 Dec 2012 19:28:28 +0000 (15:28 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 20 Dec 2012 19:28:28 +0000 (15:28 -0400)

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