Merge branch 'master' of ssh://srv2.wpitchoune.net/srv/git/www
authorJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 23 Aug 2016 01:42:33 +0000 (03:42 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 23 Aug 2016 01:42:33 +0000 (03:42 +0200)
commit6c6f9ec62256a2c934f081d15fbfc3ffe1bff714
tree8c2e8dc37d484ccb3f56a876eccca47872bfa06f
parentbf69c86bf77da1781e8f007d6ac94c686d6eecf2
parentc4623c44c2d9dcb536eb8ffd84af12db31deac8d
Merge branch 'master' of ssh://srv2.wpitchoune.net/srv/git/www