tree d92cc3017add6a1f5521132ea6924a6fe7b47a8b
parent fe2b8359c53d17224fba7fa1cb2db1d6ffca1098
parent c8667056d5a62d00eed33c2a30125e89e17e367c
author Craig Tiller <craig.tiller@gmail.com> 1430266651 -0700
committer Craig Tiller <craig.tiller@gmail.com> 1430266651 -0700

Merge github.com:grpc/grpc into delete-the-old-api

Conflicts:
	include/grpc++/channel_interface.h