merge with default for 6.1.0 stable
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Wed, 03 May 2017 12:31:40 +0200
branchstable
changeset 2313 65b4a8c40fad
parent 2287 18b8dc058f75 (diff)
parent 2312 b9ce138eca63 (current diff)
child 2314 2e0a15985657
merge with default for 6.1.0