From: intrigeri <intrigeri@boum.org>
Date: Thu, 1 Jan 2009 12:34:00 +0000 (+0100)
Subject: Merge commit 'upstream/master' into prv/po
X-Git-Tag: 3.15~302
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5c2f6cb8935f828274511ba5ca0d92b586632740;p=ikiwiki.git

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

5c2f6cb8935f828274511ba5ca0d92b586632740