Protobuf BUG + 可选是否堵塞#25

Open

mr-kelly wants to merge 8 commits intoNetEase:masterfrom

cosmosbox:master

Commits on Mar 14, 2015

Merge branch 'master' of https://github.com/NetEase/pomelo-unityclient-socket
mr-kelly
committed

Commits on Jun 9, 2015

Merge branch 'master' of https://github.com/NetEase/pomelo-unityclient-socket
mr-kelly
committed

Commits on Jul 24, 2015