projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a27fad4 9af1173)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 3 Jan 2010 19:12:39 +0000 (14:12 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 3 Jan 2010 19:12:39 +0000 (14:12 -0500)

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