From: intrigeri Date: Fri, 28 Nov 2008 13:19:47 +0000 (+0100) Subject: Merge commit 'upstream/master' into pub/master X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/0d3a41e39d35fc6f1b5edcffc674e1be40b85619?ds=inline;hp=-c Merge commit 'upstream/master' into pub/master --- 0d3a41e39d35fc6f1b5edcffc674e1be40b85619