From: intrigeri <intrigeri@boum.org>
Date: Wed, 12 Nov 2008 00:08:57 +0000 (+0100)
Subject: Merge commit 'upstream/po' into prv/po
X-Git-Tag: 3.15~342
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b19d0d3d245c7c2b605ac6c972c73c909a941db4;p=ikiwiki.git

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

b19d0d3d245c7c2b605ac6c972c73c909a941db4