From: intrigeri <intrigeri@boum.org>
Date: Mon, 20 Oct 2008 12:33:19 +0000 (+0200)
Subject: Merge commit 'origin/master' into prv/po
X-Git-Tag: 3.15~409^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fadb26bc1507f7fc2caaa873ad32c12f75c378aa;p=ikiwiki.git

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

fadb26bc1507f7fc2caaa873ad32c12f75c378aa