projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6a4da7 2ebc0bb)
Merge branch 'prv/po' into pub/po
authorintrigeri <intrigeri@boum.org>
Sun, 2 Nov 2008 19:15:21 +0000 (20:15 +0100)
committerintrigeri <intrigeri@boum.org>
Sun, 2 Nov 2008 19:15:21 +0000 (20:15 +0100)

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