projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d4b4b3d 545029f)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 28 Aug 2009 00:19:28 +0000 (20:19 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 28 Aug 2009 00:19:28 +0000 (20:19 -0400)

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