From: Jean-Philippe Orsini Date: Tue, 23 Aug 2016 01:42:33 +0000 (+0200) Subject: Merge branch 'master' of ssh://srv2.wpitchoune.net/srv/git/www X-Git-Url: https://wpitchoune.net/gitweb/?p=www.git;a=commitdiff_plain;h=6c6f9ec62256a2c934f081d15fbfc3ffe1bff714 Merge branch 'master' of ssh://srv2.wpitchoune.net/srv/git/www --- 6c6f9ec62256a2c934f081d15fbfc3ffe1bff714