From: intrigeri <intrigeri@boum.org>
Date: Thu, 6 Nov 2008 11:32:41 +0000 (+0100)
Subject: Merge commit 'upstream/master' into prv/po
X-Git-Tag: 3.15~402
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e7f508c5ac43e7798f7fae0018f6ca530708a98a;p=ikiwiki.git

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

e7f508c5ac43e7798f7fae0018f6ca530708a98a