projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0ac346 32b86c5)
Merge commit 'upstream/master' into pub/po
authorintrigeri <intrigeri@boum.org>
Fri, 7 Nov 2008 21:19:34 +0000 (22:19 +0100)
committerintrigeri <intrigeri@boum.org>
Fri, 7 Nov 2008 21:19:34 +0000 (22:19 +0100)

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