projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 73a7bd2 aecc45b)
Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Sun, 18 Jan 2009 12:56:15 +0000 (13:56 +0100)
committerintrigeri <intrigeri@boum.org>
Sun, 18 Jan 2009 12:56:15 +0000 (13:56 +0100)

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