Merge branch '3.4.0' into 3.5.0
authorStephane Delcroix <stephane@delcroix.org>
Mon, 3 Dec 2018 07:57:17 +0000 (08:57 +0100)
committerStephane Delcroix <stephane@delcroix.org>
Mon, 3 Dec 2018 07:57:17 +0000 (08:57 +0100)
commit59116665fd53639e1859d2b935622870a5b9a9dd
tree84f0e20da2da2d97361ebb9e4291b9aad604a5f3
parent8a61e2d87080fe49881ea01798c82b56de58f6ca
parent5a65df826dbc27c82e2a535e5f899f0348dde522
Merge branch '3.4.0' into 3.5.0