projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f5c8fca 98d2356)
Merge commit '3.20110715' into prv/po
authorintrigeri <intrigeri@boum.org>
Mon, 18 Jul 2011 16:41:37 +0000 (18:41 +0200)
committerintrigeri <intrigeri@boum.org>
Mon, 18 Jul 2011 16:41:37 +0000 (18:41 +0200)

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