From: intrigeri <intrigeri@boum.org>
Date: Fri, 7 Nov 2008 10:54:03 +0000 (+0100)
Subject: Merge commit 'upstream/po' into prv/po
X-Git-Tag: 3.15~390
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d843b2ce88052ddf41e81dec6f8618d2a74c5c8d;p=ikiwiki.git

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

d843b2ce88052ddf41e81dec6f8618d2a74c5c8d