From: intrigeri Date: Thu, 13 Nov 2008 13:46:10 +0000 (+0100) Subject: Merge commit 'upstream/master' into pub/master X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/44ca50db9d87142d860b1d9d959a27ede0402b0d Merge commit 'upstream/master' into pub/master --- 44ca50db9d87142d860b1d9d959a27ede0402b0d