Merge pull request #3533 from preco21/master
authorCheng Zhao <zcbenz@gmail.com>
Mon, 23 Nov 2015 08:41:02 +0000 (16:41 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Mon, 23 Nov 2015 08:41:02 +0000 (16:41 +0800)
commit1a1d5aba94f11bf984e324c8daefd57b767f6fef
tree38239eb2f44366e5821a7ce533c4ad8aba4da99e
parent29052b04986daf55ecda4163bb94adaf522d1a10
parent1cf3216f50fde3a33e0fdb8aa8ab6e5a4db61cb3
Merge pull request #3533 from preco21/master

Update as upstream