From: intrigeri Date: Mon, 20 Dec 2010 13:27:21 +0000 (+0100) Subject: Merge remote branch 'upstream/master' into prv/po X-Git-Tag: 3.20101231~44^2~4 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/75196e76b627709a6ecae3fa948e1fba7928a5ce Merge remote branch 'upstream/master' into prv/po --- 75196e76b627709a6ecae3fa948e1fba7928a5ce