projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf43ae5 c68413d)
Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Fri, 28 Aug 2009 12:23:38 +0000 (14:23 +0200)
committerintrigeri <intrigeri@boum.org>
Fri, 28 Aug 2009 12:23:38 +0000 (14:23 +0200)

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