From: intrigeri Date: Mon, 24 Nov 2008 20:53:28 +0000 (+0100) Subject: Merge commit 'upstream/master' into pub/master X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d47de5a7dfc0cc3e9d8ed2d51fc0e353f3141177 Merge commit 'upstream/master' into pub/master --- d47de5a7dfc0cc3e9d8ed2d51fc0e353f3141177