From: intrigeri <intrigeri@boum.org>
Date: Fri, 7 Nov 2008 21:19:24 +0000 (+0100)
Subject: Merge commit 'upstream/master' into prv/po
X-Git-Tag: 3.15~381^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=339478ba4737d77b5e03a3489c3f1f78b7af147d;p=ikiwiki.git

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

339478ba4737d77b5e03a3489c3f1f78b7af147d