projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 487df7f 0cb3d3a)
Merge remote branch 'upstream/master' into anonpush
authorintrigeri <intrigeri@boum.org>
Thu, 26 May 2011 15:12:43 +0000 (17:12 +0200)
committerintrigeri <intrigeri@boum.org>
Thu, 26 May 2011 15:12:43 +0000 (17:12 +0200)

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