projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 50a5ab3 b41cc4b)
Merge branch 'master' of git://git.ikiwiki.info into aggregateinternal
authorSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Tue, 15 Jul 2008 00:00:18 +0000 (01:00 +0100)
committerSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Tue, 15 Jul 2008 00:00:18 +0000 (01:00 +0100)

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