From: intrigeri <intrigeri@boum.org>
Date: Mon, 2 Aug 2010 09:18:35 +0000 (+0200)
Subject: Merge remote branch 'upstream/master' into prv/po
X-Git-Tag: 3.20100831~33^2~10
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/22d982243716bb04f56e4e78e573e3ec49077309

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

22d982243716bb04f56e4e78e573e3ec49077309