Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
THRIFT-1893 HTTP/JSON server/client for node.js
Client: nodejs
Patch: Phillip Campbell
Merge ../thrift into trunk