From: intrigeri <intrigeri@boum.org>
Date: Thu, 27 Aug 2009 17:56:37 +0000 (+0200)
Subject: Merge commit 'upstream/master' into prv/po
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/0c032b0ccb3766c422980a0e956dacbe44cfa021

Merge commit 'upstream/master' into prv/po
---

0c032b0ccb3766c422980a0e956dacbe44cfa021