Craig Tiller 347b83c222 Merge github.com:grpc/grpc into copyright ... Conflicts: src/python/src/__init__.py src/python/src/_adapter/__init__.py src/python/src/_framework/__init__.py src/python/src/_framework/base/__init__.py src/python/src/_framework/base/packets/__init__.py src/python/src/_framework/common/__init__.py src/python/src/_framework/face/__init__.py src/python/src/_framework/face/testing/__init__.py src/python/src/_framework/foundation/__init__.py src/python/src/_junkdrawer/__init__.py		2015-02-17 20:28:40 -08:00
..
tools/run_tests	Googlify indentation	2015-01-18 11:44:17 -08:00
vsprojects/vs2013	added zlib and openssl dependencies	2015-02-13 09:39:54 -08:00
Makefile.template	Merge github.com:grpc/grpc into copyright	2015-02-17 20:28:40 -08:00