Merge tag 'upstream/2.0.5.2'
authorBoyuan Yang <073plan@gmail.com>
Tue, 28 Nov 2017 12:11:25 +0000 (20:11 +0800)
committerBoyuan Yang <073plan@gmail.com>
Tue, 28 Nov 2017 12:11:25 +0000 (20:11 +0800)
commit537493827859d3d43de3696ce71933f706de1554
tree082dfbbe2d2111ec4a80fcaa499ab7d47508c255
parentbabe32be49ac30dffbbd02c887b5df323f1f7150
parentb9f373536120901237701a8b2daa203a5aa11ddb
Merge tag 'upstream/2.0.5.2'