projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b3c3c42 983ecb0)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 26 Feb 2010 16:50:24 +0000 (11:50 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 26 Feb 2010 16:50:24 +0000 (11:50 -0500)

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