projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74055be fd6d4fd)
Merge remote branch 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Wed, 22 Dec 2010 11:54:18 +0000 (12:54 +0100)
committerintrigeri <intrigeri@boum.org>
Wed, 22 Dec 2010 11:54:18 +0000 (12:54 +0100)

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