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)
commit30d3073487892c62872bfc407c18cedb2247b875
treea1eefeaf59f0ced1ca051f02b3314785210dd6e4
parent6fff7902fa472ba93dda3c69455ce74b35d04fda
parentc46f8fa409e1238bafec114587876df5ef88024e
Merge branch 'master' of ssh://wpitchoune.net/srv/git/www