Merge remote-tracking branch 'github/master' into contrib
authorLeo Terziman <leo.terziman@clarte.asso.fr>
Thu, 8 Jun 2017 09:01:11 +0000 (11:01 +0200)
committerLeo Terziman <leo.terziman@clarte.asso.fr>
Thu, 8 Jun 2017 09:01:11 +0000 (11:01 +0200)
commit4974c99288f59cf9ecf0bcdf4b09f4dc77acc30e
tree3f76cb85be0cf5ed6eea536ae3cf1422207fc785
parentca5ac0b5324773a9b4074fdf9fc676cafd0cf566
parent1eb1c5ed4e47d86596053b41db2bfce14205e3a1
Merge remote-tracking branch 'github/master' into contrib