projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6fe2ec0 ff5ae25)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 22 Nov 2009 20:08:29 +0000 (15:08 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 22 Nov 2009 20:08:29 +0000 (15:08 -0500)

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