From: intrigeri Date: Fri, 7 Nov 2008 20:29:36 +0000 (+0100) Subject: Merge commit 'upstream/master' into pub/master X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ed1673929562adb8747b2e6dca424df92d210013 Merge commit 'upstream/master' into pub/master --- ed1673929562adb8747b2e6dca424df92d210013