Merge pull request #3409 from preco21/master
authorCheng Zhao <zcbenz@gmail.com>
Thu, 12 Nov 2015 04:49:51 +0000 (12:49 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Thu, 12 Nov 2015 04:49:51 +0000 (12:49 +0800)
commitcb1dc6b2e21f788d19c20cc42e8459d1cbc16888
tree0065cfb5f46633f11bac520592b3dc6053221e03
parentca49ddc95dbc25e641e5258980dc4ee4673e1a23
parent020214ff951ff837f83247621b762689f1b1fa21
Merge pull request #3409 from preco21/master

Update as upstream