projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ab3ed8 79a3fbb)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2.61
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 15 Aug 2008 01:13:19 +0000 (21:13 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 15 Aug 2008 01:13:19 +0000 (21:13 -0400)

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