Merge branch 'master' of ssh://wpitchoune.net/srv/git/www
authorJean-Philippe Orsini <orsinije@fr.ibm.com>
Sat, 27 May 2017 16:19:35 +0000 (18:19 +0200)
committerJean-Philippe Orsini <orsinije@fr.ibm.com>
Sat, 27 May 2017 16:19:35 +0000 (18:19 +0200)

Trivial merge