Merge branch 'master' of ssh://git.wpitchoune.net/srv/git/www
authorJean-Philippe Orsini <orsinije@fr.ibm.com>
Mon, 11 Jul 2016 10:32:30 +0000 (12:32 +0200)
committerJean-Philippe Orsini <orsinije@fr.ibm.com>
Mon, 11 Jul 2016 10:32:30 +0000 (12:32 +0200)

Trivial merge