From: intrigeri Date: Thu, 6 Nov 2008 15:29:47 +0000 (+0100) Subject: Merge commit 'upstream/master' into pub/master X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ce4855ecb086d17b8a5e725bb56235b370480f71?hp=--cc Merge commit 'upstream/master' into pub/master --- ce4855ecb086d17b8a5e725bb56235b370480f71