From: intrigeri Date: Fri, 21 Nov 2008 15:09:33 +0000 (+0100) Subject: Merge commit 'upstream/master' into pub/master X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/5c418d269304af618b142e0328742fc7d7157c62?hp=--cc Merge commit 'upstream/master' into pub/master --- 5c418d269304af618b142e0328742fc7d7157c62