From: intrigeri Date: Wed, 22 Dec 2010 11:54:18 +0000 (+0100) Subject: Merge remote branch 'upstream/master' into prv/po X-Git-Tag: 3.20101231~44^2~2 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a8d733130e99c3b611605d2b3d0db9a9ca8f98f7 Merge remote branch 'upstream/master' into prv/po --- a8d733130e99c3b611605d2b3d0db9a9ca8f98f7