From: intrigeri Date: Sat, 8 Nov 2008 16:07:13 +0000 (+0100) Subject: Merge commit 'upstream/master' into pub/master X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/51de5d80bd318b52efecef4253eeab8292139922 Merge commit 'upstream/master' into pub/master --- 51de5d80bd318b52efecef4253eeab8292139922