projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c2962e e5ed3c9)
Merge remote branch 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Mon, 20 Dec 2010 13:27:21 +0000 (14:27 +0100)
committerintrigeri <intrigeri@boum.org>
Mon, 20 Dec 2010 13:27:21 +0000 (14:27 +0100)

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