tree 9d8afeb18c21cddcbfb9bb014f08f1474021db98
parent b7c2035e83a9b3e346f1fd37f9ad55c2070fb02e
parent 3afd92ff511f52db3ecf892d9af65053323c89cb
author Nicolas "Pixel" Noble <pixel@nobis-crew.org> 1429827150 +0200
committer Nicolas "Pixel" Noble <pixel@nobis-crew.org> 1429828699 +0200

Merge branch 'master' of github.com:grpc/grpc into the-purge-2

Conflicts:
	src/cpp/client/channel.cc
	vsprojects/vs2010/grpc++.vcxproj
	vsprojects/vs2013/grpc++.vcxproj.filters