projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d70ba7c 0a9bb3e)
Merge tag '3.20120202' into trail3-integrated
authorSimon McVittie <smcv@debian.org>
Sun, 18 Mar 2012 15:31:41 +0000 (15:31 +0000)
committerSimon McVittie <smcv@debian.org>
Sun, 18 Mar 2012 15:31:41 +0000 (15:31 +0000)

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