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