From: intrigeri <intrigeri@boum.org>
Date: Mon, 10 Nov 2008 14:41:29 +0000 (+0100)
Subject: Merge commit 'upstream/master' into prv/po
X-Git-Tag: 3.15~366
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=812f775e0a3cd953782edcbe8a0eb727752df03f;p=ikiwiki.git

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

812f775e0a3cd953782edcbe8a0eb727752df03f