Merge remote-tracking branch 'origin/master' into stable
commitac30a3dc35457d9cf7220e0acce68d7cbfc4c6d3
authorCyril Brulebois <ckb@riseup.net>
Mon, 22 Oct 2018 21:02:57 +0000 (22 23:02 +0200)
committerCyril Brulebois <ckb@riseup.net>
Mon, 22 Oct 2018 21:02:57 +0000 (22 23:02 +0200)
tree70fdace26f03e7f881afd4542095ec85a272d155
parente7aa0f7827edf47108cfaa667217fef380e0b1f8
parentc7b7b5ddde9e177619b0116f0096233c33bd68a3
Merge remote-tracking branch 'origin/master' into stable