From: intrigeri <intrigeri@boum.org>
Date: Thu, 27 Aug 2009 17:56:37 +0000 (+0200)
Subject: Merge commit 'upstream/master' into prv/po
X-Git-Tag: 3.1415926~42^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0c032b0ccb3766c422980a0e956dacbe44cfa021;p=ikiwiki.git

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

0c032b0ccb3766c422980a0e956dacbe44cfa021