projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5eed0fd 699aa79)
Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Thu, 13 Nov 2008 03:39:53 +0000 (04:39 +0100)
committerintrigeri <intrigeri@boum.org>
Thu, 13 Nov 2008 03:39:53 +0000 (04:39 +0100)

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