From: intrigeri <intrigeri@boum.org>
Date: Sat, 24 Jul 2010 09:19:28 +0000 (+0200)
Subject: Merge remote branch 'upstream/master' into prv/po
X-Git-Tag: 3.20100804~25^2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2f71e7f8f5a5c69753fb77c897d4446cdc23f856?hp=2f71e7f8f5a5c69753fb77c897d4446cdc23f856

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