From: intrigeri <intrigeri@boum.org>
Date: Tue, 4 Nov 2008 22:39:15 +0000 (+0100)
Subject: Merge commit 'upstream/master' into prv/po
X-Git-Tag: 3.15~406^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4c6c00ccdff71fbb8973de7d256fc987d7a2a7e0;p=ikiwiki.git

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

4c6c00ccdff71fbb8973de7d256fc987d7a2a7e0