From: intrigeri <intrigeri@boum.org>
Date: Thu, 13 Nov 2008 03:39:53 +0000 (+0100)
Subject: Merge commit 'upstream/master' into prv/po
X-Git-Tag: 3.15~323
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3190e5cea75a43d38f58b8a45fbc87d5527d18f0;p=ikiwiki.git

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

3190e5cea75a43d38f58b8a45fbc87d5527d18f0