From: intrigeri <intrigeri@boum.org>
Date: Sun, 18 Jan 2009 12:56:15 +0000 (+0100)
Subject: Merge commit 'upstream/master' into prv/po
X-Git-Tag: 3.15~245
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=14b49376dc03672f896e5f1df3945a718a39d5a0;p=ikiwiki.git

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

14b49376dc03672f896e5f1df3945a718a39d5a0