projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 30c30a0 7c5bfbe)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 14 Mar 2010 17:16:12 +0000 (13:16 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 14 Mar 2010 17:16:12 +0000 (13:16 -0400)

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