projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44b0cea eeb0ec1)
Merge branch 'ready/tag-test' into transient-tag
authorSimon McVittie <smcv@debian.org>
Fri, 7 Jan 2011 20:09:09 +0000 (20:09 +0000)
committerSimon McVittie <smcv@debian.org>
Fri, 7 Jan 2011 20:09:09 +0000 (20:09 +0000)

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