Merge branch 'master' of ssh://srv2.wpitchoune.net/srv/git/www
authorJean-Philippe Orsini <jeanfi@gmail.com>
Wed, 15 Jun 2016 08:46:45 +0000 (10:46 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Wed, 15 Jun 2016 08:46:45 +0000 (10:46 +0200)
commit88a52c46d396acb681f1039881210f0e0984fecd
tree88081365ea4b07830eeb0b70b7575100c52d2ee4
parent2dcea32110af72e32919f5b2eae2165224814e63
parentc44ac83a60e02886b8a23c7eb394ba66af66962a
Merge branch 'master' of ssh://srv2.wpitchoune.net/srv/git/www