projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff422a1 f4cab29)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 12 Dec 2009 20:48:09 +0000 (15:48 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 12 Dec 2009 20:48:09 +0000 (15:48 -0500)

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