projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a65d312 50a5ab3)
Merge branch 'aggregateinternal'
authorSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Mon, 14 Jul 2008 23:02:15 +0000 (00:02 +0100)
committerSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Mon, 14 Jul 2008 23:02:15 +0000 (00:02 +0100)

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