projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5948bb0 e083e4c)
Merge remote branch 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Mon, 2 Aug 2010 09:18:35 +0000 (11:18 +0200)
committerintrigeri <intrigeri@boum.org>
Mon, 2 Aug 2010 09:18:35 +0000 (11:18 +0200)

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