projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 20bf162 844bb81)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 12 Mar 2010 20:21:07 +0000 (15:21 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 12 Mar 2010 20:21:07 +0000 (15:21 -0500)

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