Craig Tiller 6437bd5037 Merge github.com:google/grpc into javascript %!s(int64=11) %!d(string=hai) anos
..
compiler ecd49345b5 Use clang-format-3.5 %!s(int64=11) %!d(string=hai) anos
core 6437bd5037 Merge github.com:google/grpc into javascript %!s(int64=11) %!d(string=hai) anos
cpp 48c9c4a59e Resolved merge conflicts with master %!s(int64=11) %!d(string=hai) anos
node 9df2693744 Fixed file references to match moved files %!s(int64=11) %!d(string=hai) anos
php d10c0abaf6 Merge branch 'master' of github.com:google/grpc into merge_new_invoke_api %!s(int64=11) %!d(string=hai) anos
python 7a3c38bed9 Add the _framework.face package. %!s(int64=11) %!d(string=hai) anos
ruby c060e07993 Merge pull request #236 from tbetbetbe/grpc_ruby_update_interop_test_flags %!s(int64=11) %!d(string=hai) anos