From: intrigeri <intrigeri@boum.org>
Date: Mon, 18 Jul 2011 16:41:37 +0000 (+0200)
Subject: Merge commit '3.20110715' into prv/po
X-Git-Tag: 3.20110905~131^2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/739554622fa1caa6bcc0474ebbdcd9db3627389d?hp=-c

Merge commit '3.20110715' into prv/po
---

739554622fa1caa6bcc0474ebbdcd9db3627389d