From: intrigeri <intrigeri@boum.org>
Date: Thu, 21 May 2009 07:15:55 +0000 (+0200)
Subject: Merge commit 'upstream/master' into pub/po
X-Git-Tag: 3.15~187
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=df6f6a1d53493de0ee4f451220b8c8d34af6642a;p=ikiwiki.git

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

df6f6a1d53493de0ee4f451220b8c8d34af6642a