projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f97199 295a9e1)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 3.14159
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 16 Jul 2009 18:46:09 +0000 (14:46 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 16 Jul 2009 18:46:09 +0000 (14:46 -0400)

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