From: intrigeri Date: Mon, 10 Nov 2008 11:21:40 +0000 (+0100) Subject: Merge commit 'upstream/master' into pub/master X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/24768a754c1f619fd9ffd3266461179b678edc91?hp=--cc Merge commit 'upstream/master' into pub/master --- 24768a754c1f619fd9ffd3266461179b678edc91