Merge pull request #3398 from preco21/master
authorCheng Zhao <zcbenz@gmail.com>
Wed, 11 Nov 2015 02:06:47 +0000 (10:06 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Wed, 11 Nov 2015 02:06:47 +0000 (10:06 +0800)
commit961e06ba6c6888e2a506fdc642bd52f0f67b1b64
tree01826b55f99d6c0fb7cb19efdeb57f7c98f7b2e2
parent3af1d907d82ff1ff47acca4f41c64e04ab9bd802
parent319acc1e8afbeec7cb2ab2bedce2ee86284d6a40
Merge pull request #3398 from preco21/master

Update as upstream