projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6709f6 a7b8131)
Merge branch 'master' into integration
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 20 Jul 2009 05:20:43 +0000 (07:20 +0200)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 20 Jul 2009 05:20:43 +0000 (07:20 +0200)

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