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-Url: http://git.tremily.us/?a=commitdiff_plain;h=739554622fa1caa6bcc0474ebbdcd9db3627389d;p=ikiwiki.git

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

739554622fa1caa6bcc0474ebbdcd9db3627389d