projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed360d0 039ffc5)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 29 Jul 2011 10:54:39 +0000 (12:54 +0200)
committerJoey Hess <joey@kitenet.net>
Fri, 29 Jul 2011 10:54:39 +0000 (12:54 +0200)

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