From: intrigeri <intrigeri@boum.org>
Date: Sun, 8 Mar 2009 23:32:10 +0000 (+0100)
Subject: Merge commit 'upstream/master' into prv/po
X-Git-Tag: 3.15~206
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f4a1732b0e65ea4459098e4e852dff10a5af9320

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

f4a1732b0e65ea4459098e4e852dff10a5af9320