From: intrigeri Date: Thu, 6 Nov 2008 15:29:47 +0000 (+0100) Subject: Merge commit 'upstream/master' X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/b78a9e270424574b3f585fce9d83e7ba3296267f?hp=--cc Merge commit 'upstream/master' --- b78a9e270424574b3f585fce9d83e7ba3296267f