projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 225e21f 4dc4c95)
Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Tue, 4 Nov 2008 22:39:15 +0000 (23:39 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 4 Nov 2008 22:39:15 +0000 (23:39 +0100)

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