projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de7c3aa 127ed4d)
Merge branch 'master' into cvs
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 4 Sep 2009 21:15:11 +0000 (17:15 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 4 Sep 2009 21:15:11 +0000 (17:15 -0400)

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