projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7d7acc 5a627f1)
Merge commit 'schmonz/master'
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 11 Sep 2009 22:14:58 +0000 (18:14 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 11 Sep 2009 22:14:58 +0000 (18:14 -0400)

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