From: intrigeri Date: Sun, 11 Jul 2010 09:04:59 +0000 (+0200) Subject: Merge remote branch 'upstream/filter-full' into prv/po X-Git-Tag: 3.20100722~8^2~8^2~3 X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=d6f9d7743167cb4b58f16f1e371585f09dc15a0b Merge remote branch 'upstream/filter-full' into prv/po --- d6f9d7743167cb4b58f16f1e371585f09dc15a0b