projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b2890b4 0b63800)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 29 Mar 2010 19:25:40 +0000 (15:25 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 29 Mar 2010 19:25:40 +0000 (15:25 -0400)

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