Merge remote-tracking branch 'upstream/master' 6096/head
authorXavier Franquet <xavier@franquet.es>
Tue, 29 May 2018 07:07:16 +0000 (09:07 +0200)
committerXavier Franquet <xavier@franquet.es>
Tue, 29 May 2018 07:07:16 +0000 (09:07 +0200)
commit429b955ca2b9492fb867bf819b042ef35c127080
tree1467906210b80fecf53d9cfefec4ca1b105ae848
parent425331f316812c195c32b1095fd5a9646b8b381f
parentd7ffa9ca0e1c344e162daaac1225a3d9a2da46a5
Merge remote-tracking branch 'upstream/master'