From: intrigeri <intrigeri@boum.org>
Date: Sun, 11 Jul 2010 08:46:18 +0000 (+0200)
Subject: Merge remote branch 'upstream/master' into prv/po
X-Git-Tag: 3.20100722~8^2~8^2~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c99d26030e6ddd7a21932e98e40a8df7d896886d;p=ikiwiki.git

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

Conflicts:
	IkiWiki/Plugin/po.pm
	doc/plugins/po.mdwn
---

c99d26030e6ddd7a21932e98e40a8df7d896886d