From: intrigeri Date: Fri, 7 Nov 2008 10:52:19 +0000 (+0100) Subject: Merge commit 'upstream/master' into pub/master X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2a8e2af9a2bc131db3f966f8235cd743da84b83e Merge commit 'upstream/master' into pub/master --- 2a8e2af9a2bc131db3f966f8235cd743da84b83e