From: intrigeri <intrigeri@boum.org>
Date: Fri, 28 Aug 2009 13:57:46 +0000 (+0200)
Subject: Merge commit 'upstream/master' into prv/po
X-Git-Tag: 3.1415926~10^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=be954ff3cbc34d8b96a10f64c1279ce6b2f02671;p=ikiwiki.git

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

be954ff3cbc34d8b96a10f64c1279ce6b2f02671