From: intrigeri Date: Mon, 23 Aug 2010 07:36:22 +0000 (+0200) Subject: Merge remote branch 'upstream/master' into prv/po X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=8c2962ec48ae57605d6d0e297be437a97b6229ca Merge remote branch 'upstream/master' into prv/po --- 8c2962ec48ae57605d6d0e297be437a97b6229ca