projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf374e9 dfc5016)
Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Mon, 26 Jan 2009 21:51:50 +0000 (22:51 +0100)
committerintrigeri <intrigeri@boum.org>
Mon, 26 Jan 2009 21:51:50 +0000 (22:51 +0100)

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