From: intrigeri <intrigeri@boum.org>
Date: Sun, 22 Aug 2010 09:05:03 +0000 (+0200)
Subject: Merge remote branch 'upstream/master' into prv/po
X-Git-Tag: 3.20100831~33^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=474b6524e0fe4b4bb3402bf6551bf97be7f3ee1f;hp=--cc;p=ikiwiki.git

Merge remote branch 'upstream/master' into prv/po
---

474b6524e0fe4b4bb3402bf6551bf97be7f3ee1f