projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f54c13 466ceb1)
Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Thu, 6 Nov 2008 11:32:41 +0000 (12:32 +0100)
committerintrigeri <intrigeri@boum.org>
Thu, 6 Nov 2008 11:32:41 +0000 (12:32 +0100)

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