projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23aaa5a 0fbec10)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 10 Jun 2010 18:15:10 +0000 (14:15 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 10 Jun 2010 18:15:10 +0000 (14:15 -0400)

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