projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44b0cea 8ee9eab)
Merge branch 'ready/autoindex-autofile' into HEAD
authorSimon McVittie <smcv@debian.org>
Sat, 22 Jan 2011 22:35:37 +0000 (22:35 +0000)
committerSimon McVittie <smcv@debian.org>
Sat, 22 Jan 2011 22:35:37 +0000 (22:35 +0000)

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