From: intrigeri <intrigeri@boum.org>
Date: Tue, 29 Jun 2010 13:53:51 +0000 (+0200)
Subject: Merge remote branch 'upstream/master' into prv/po
X-Git-Tag: 3.20100722~8^2~8^2~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1786b106a9c7f448136ff47d9b6dd26d48a5dd2e;p=ikiwiki.git

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

Conflicts:
	doc/plugins/po.mdwn
---

1786b106a9c7f448136ff47d9b6dd26d48a5dd2e