projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 474b652 87acb9a)
Merge remote branch 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Sun, 22 Aug 2010 09:09:37 +0000 (11:09 +0200)
committerintrigeri <intrigeri@boum.org>
Sun, 22 Aug 2010 09:09:37 +0000 (11:09 +0200)

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