Merge pull request #1 from 0xDEADFACE/master
author0xDEADFACE <masmfan@gmail.com>
Mon, 27 Jan 2014 08:57:58 +0000 (00:57 -0800)
committer0xDEADFACE <masmfan@gmail.com>
Mon, 27 Jan 2014 08:57:58 +0000 (00:57 -0800)
commitda78b3156d41d5ee4ef0bda8159c04b91125064c
tree5f2513ba48d3e678b8f5d79ae7830f545860e357
parent7d700b34ba4213906a7429292a7f3aae1f30d677
parent8e0c7b0aa076954469cb1c35785aff8005c8c60f
Merge pull request #1 from 0xDEADFACE/master

Protocol update, set version to 60011