Merge branch upstream/8.0 into 8.0
authorSébastien CHAZALLET <s.chazallet@gmail.com>
Wed, 26 Nov 2014 10:07:24 +0000 (11:07 +0100)
committerSébastien CHAZALLET <s.chazallet@gmail.com>
Wed, 26 Nov 2014 10:07:24 +0000 (11:07 +0100)
commit547d831119fa53c1902299c1e721023ab46a3f78
tree2be2399d23001d314e9f96b8f9611c7281a28cf9
parent04974b2bc1f35e2dfddc63959b821bfbc1f36a71
parent76080efdbc286d5f1f03d2f41eb83358f152b3d8
Merge branch upstream/8.0 into 8.0