From: intrigeri <intrigeri@boum.org>
Date: Mon, 20 Dec 2010 13:27:21 +0000 (+0100)
Subject: Merge remote branch 'upstream/master' into prv/po
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=75196e76b627709a6ecae3fa948e1fba7928a5ce;hp=-c

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

75196e76b627709a6ecae3fa948e1fba7928a5ce