Merge branch '3.6.0'
authorStephane Delcroix <stephane@delcroix.org>
Mon, 18 Feb 2019 08:15:37 +0000 (09:15 +0100)
committerStephane Delcroix <stephane@delcroix.org>
Mon, 18 Feb 2019 08:15:37 +0000 (09:15 +0100)
commitc3a5a6b850bc24ad8ff9801ae7c8b92a6e1be6dc
tree9762f437d34b86a211b2aa8dab5c3f8d52153409
parent4cfa82569dd74858849eff6bd30cdf1b6ce7552c
parent748da1e628900efe2309cb5d4bd796c4f1eb30cd
Merge branch '3.6.0'