From: intrigeri Date: Wed, 26 Nov 2008 06:57:15 +0000 (+0100) Subject: Merge commit 'upstream/master' into pub/master X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/97de9bb8605eaeb47edd4d80b444605676bb83e2?hp=-c Merge commit 'upstream/master' into pub/master --- 97de9bb8605eaeb47edd4d80b444605676bb83e2