Merge pull request #3192 from preco21/master
authorCheng Zhao <zcbenz@gmail.com>
Sat, 24 Oct 2015 07:46:59 +0000 (15:46 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Sat, 24 Oct 2015 07:46:59 +0000 (15:46 +0800)
commit2effe6eff56cecb2c53f823170a18208961d31de
tree02a6a81dd9a51dd19f6156ba811ebf1c27fde717
parent30ec7fdeed715f4a8e234bb2557497081f8d1171
parent8555aea40f300418b957509631e8c1a065925e70
Merge pull request #3192 from preco21/master

Update as upstream