From: intrigeri Date: Fri, 5 Dec 2008 21:56:51 +0000 (+0100) Subject: Merge commit 'upstream/master' into pub/master X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/6836070c171d7a9b37c884320caefe312420d3f7?hp=--cc Merge commit 'upstream/master' into pub/master --- 6836070c171d7a9b37c884320caefe312420d3f7