Merge pull request #4566 from yamatoya/master
authorCheng Zhao <zcbenz@gmail.com>
Tue, 23 Feb 2016 05:39:34 +0000 (13:39 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Tue, 23 Feb 2016 05:39:34 +0000 (13:39 +0800)
commit9c6ab6f1e02f693051622680ca9342b0fc5796d7
tree932a16224db90d6b314598ad83c7f4992fadbaf2
parent537ead89171f5978183ea16fbe87818e3e887558
parent9e1da8f097bf22b3cef4d0a4d4b3dee1c179d428
Merge pull request #4566 from yamatoya/master

Update as upstream