From: intrigeri <intrigeri@boum.org>
Date: Tue, 11 Nov 2008 03:40:24 +0000 (+0100)
Subject: Merge commit 'upstream/master' into prv/po
X-Git-Tag: 3.15~356
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3d8d47d7858ae0e043a28f348fe8aec444d0d35a;p=ikiwiki.git

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

3d8d47d7858ae0e043a28f348fe8aec444d0d35a