From: intrigeri Date: Fri, 7 Nov 2008 21:23:05 +0000 (+0100) Subject: Merge commit 'upstream/master' into pub/master X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/cab2f55b6aa81753c3b3f757a24d52f3be522fcc?hp=-c Merge commit 'upstream/master' into pub/master --- cab2f55b6aa81753c3b3f757a24d52f3be522fcc