From: intrigeri Date: Wed, 12 Nov 2008 11:54:29 +0000 (+0100) Subject: Merge commit 'upstream/master' into pub/master X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/fdb4fad223cac4b5a87f7da2de9fc7dc1b9a8f8b Merge commit 'upstream/master' into pub/master --- fdb4fad223cac4b5a87f7da2de9fc7dc1b9a8f8b