From: intrigeri <intrigeri@boum.org>
Date: Mon, 23 Aug 2010 07:36:22 +0000 (+0200)
Subject: Merge remote branch 'upstream/master' into prv/po
X-Git-Tag: 3.20101231~44^2~5
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/8c2962ec48ae57605d6d0e297be437a97b6229ca

Merge remote branch 'upstream/master' into prv/po
---

8c2962ec48ae57605d6d0e297be437a97b6229ca