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