Merge pull request #3688 from preco21/master
authorCheng Zhao <zcbenz@gmail.com>
Fri, 4 Dec 2015 10:46:33 +0000 (18:46 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Fri, 4 Dec 2015 10:46:33 +0000 (18:46 +0800)
commit427a2642a9b952bf5290f21a58f4e716205a6f66
tree8e6192acfd58acf640462ec5835af7f78ca2601c
parentc8e2be7b281d55bab8036058df9db52d90d14faa
parent0bcc23d8fe17d5da943c92e036d2439411d51033
Merge pull request #3688 from preco21/master

Update as upstream