From: intrigeri Date: Tue, 11 Nov 2008 03:39:51 +0000 (+0100) Subject: Merge commit 'upstream/master' into pub/master X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c0275aa17f44d7605f542461d800567dde7f79b8 Merge commit 'upstream/master' into pub/master --- c0275aa17f44d7605f542461d800567dde7f79b8