From: intrigeri <intrigeri@boum.org>
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.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d6f9d7743167cb4b58f16f1e371585f09dc15a0b?ds=sidebyside;hp=--cc

Merge remote branch 'upstream/filter-full' into prv/po
---

d6f9d7743167cb4b58f16f1e371585f09dc15a0b