tree 63f35f7cfff7fa20c682490d756ec436ab3c71f3
parent f0295cb88598ccc7428ad67d8d7bddbc29620152
parent 7b582f6229c8ca784d4b0b7cf9727ca6af71c0a7
author Craig Tiller <craig.tiller@gmail.com> 1438218587 -0700
committer Craig Tiller <craig.tiller@gmail.com> 1438218587 -0700

Merge github.com:grpc/grpc into yeah-we-know-what-youre-talking-about

Conflicts:
	src/core/channel/http_client_filter.c
	src/core/surface/channel.c