From: Jean-Philippe Orsini Date: Wed, 15 Jun 2016 08:46:45 +0000 (+0200) Subject: Merge branch 'master' of ssh://srv2.wpitchoune.net/srv/git/www X-Git-Url: https://git.wpitchoune.net/gitweb/?p=www.git;a=commitdiff_plain;h=88a52c46d396acb681f1039881210f0e0984fecd Merge branch 'master' of ssh://srv2.wpitchoune.net/srv/git/www --- 88a52c46d396acb681f1039881210f0e0984fecd