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

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

a06b8590cebfbc7dc7075b72f8cabd7279a88c59