Merge remote-tracking branch 'github/master' into contrib
authorLeo Terziman <leo.terziman@clarte.asso.fr>
Thu, 9 Mar 2017 16:28:47 +0000 (17:28 +0100)
committerLeo Terziman <leo.terziman@clarte.asso.fr>
Thu, 9 Mar 2017 16:28:47 +0000 (17:28 +0100)
commitbbd487308bc06a057041d53528f4dc63d74d950c
tree5c9ef8856a3a78d88145b06a960744f8b299fc7d
parent2a6f722a7dbd2894c091fc1a05dc0ef8530dd043
parentd402825d03517b94cf4eac8c6caa9514f9e7562f
Merge remote-tracking branch 'github/master' into contrib