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)

Trivial merge