Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorHenrique Mendonça <henrique@apache.org>
Fri, 20 Sep 2013 15:15:55 +0000 (17:15 +0200)
committerHenrique Mendonça <henrique@apache.org>
Fri, 20 Sep 2013 15:15:55 +0000 (17:15 +0200)
commite594dccc85740ecc1d61f236e9135c5b90301d31
tree52920b76644b4a548108e0afcb6f9a8158c661c2
parenta9e624811f07e23fc280932e6b05587ce69c1644
parent7cf085e6c5bd1ca574cff0a1d209b13395d0d449
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift

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