Merge pull request #7741 from nicolasnoble/manual-upmerge

Makefile

examples/cpp/cpptutorial.md

examples/csharp/helloworld-from-cli/Greeter/Helloworld.cs

...ples/csharp/helloworld-from-cli/Greeter/HelloworldGrpc.cs

examples/csharp/helloworld-from-cli/Greeter/project.json

examples/csharp/helloworld-from-cli/GreeterClient/Program.cs

...les/csharp/helloworld-from-cli/GreeterClient/project.json

examples/csharp/helloworld-from-cli/GreeterServer/Program.cs

...les/csharp/helloworld-from-cli/GreeterServer/project.json

examples/csharp/helloworld-from-cli/README.md

examples/csharp/helloworld/README.md

examples/node/package.json

examples/ruby/greeter_client.rb

examples/ruby/greeter_server.rb

examples/ruby/grpc-demo.gemspec

examples/ruby/lib/helloworld_pb.rb

examples/ruby/lib/helloworld_services_pb.rb

examples/ruby/lib/route_guide_pb.rb

examples/ruby/lib/route_guide_services_pb.rb

examples/ruby/route_guide/route_guide_client.rb