projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7cc14dd 81c62f9)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 26 Nov 2008 18:29:47 +0000 (13:29 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 26 Nov 2008 18:29:47 +0000 (13:29 -0500)

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