Merge pull request #2730 from preco21/master
authorCheng Zhao <zcbenz@gmail.com>
Tue, 8 Sep 2015 05:24:42 +0000 (13:24 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Tue, 8 Sep 2015 05:24:42 +0000 (13:24 +0800)
commit40d4c65866ad57d238b390df27e56e1bc0023132
treec6012f63d1c70904be90c54b830acc585ad83a5f
parent1ca6534dcd6b45e14d986626bc4d680ca6b81249
parent21bd5789352be761a47702045431698ee4b1edd9
Merge pull request #2730 from preco21/master

Update as upstream