projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 76b078d d7da4a8)
Merge branch 'master' into aggregateinternal
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 15 Jul 2008 01:21:16 +0000 (21:21 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 15 Jul 2008 01:21:16 +0000 (21:21 -0400)

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