projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 496e852 5e515b4)
Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Thu, 27 Aug 2009 17:56:37 +0000 (19:56 +0200)
committerintrigeri <intrigeri@boum.org>
Thu, 27 Aug 2009 17:56:37 +0000 (19:56 +0200)

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