Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift

Conflicts:
	lib/nodejs/lib/thrift/static_server.js

diff --cc lib/nodejs/lib/thrift/static_server.js
index 0895c60,1627328..a1d2eaa
--- 1/lib/nodejs/lib/thrift/static_server.js
--- 2/lib/nodejs/lib/thrift/static_server.js
+++ b/lib/nodejs/lib/thrift/static_server.js
@@@ -125,7 -125,7 +125,7 @@@ exports.createStaticHttpThriftServer = 
        }
       
        fs.readFile(filename, "binary", function(err, file) {
-         if (err) {        
 -        if(err) {        
++        if (err) {
            response.writeHead(500);
            response.end(err + "\n");
            return;