From: intrigeri <intrigeri@boum.org>
Date: Sun, 2 Nov 2008 12:11:00 +0000 (+0100)
Subject: Merge commit 'origin/master' into prv/po
X-Git-Tag: 3.15~408^2~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=77136538788350ad2decaa445704ba5738074736;p=ikiwiki.git

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

77136538788350ad2decaa445704ba5738074736