Merge pull request #3743 from preco21/master
authorCheng Zhao <zcbenz@gmail.com>
Wed, 9 Dec 2015 10:10:48 +0000 (18:10 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Wed, 9 Dec 2015 10:10:48 +0000 (18:10 +0800)
commitf3c67586dc613f56e63e7105025d6bcc3f096b32
tree7b904be23ea197dec28689597933af1b829d7470
parentf7b7b3407c6d5b9a3e889ad59572e46e3c2b1b3d
parent49434142742458623e88901534321662ddb0aac4
Merge pull request #3743 from preco21/master

Update as upstream