tree 18731c7688f54f9b788decbd99d810f20d26768c
parent 22887917f54dfa3f1b42f2bc4627fb8dbd968cfb
parent d35b7107f8c54196ba8ddd55a0760e5f559e2014
author Yuki Yugui Sonoda <yugui@yugui.jp> 1429225561 +0900
committer Yuki Yugui Sonoda <yugui@yugui.jp> 1429225561 +0900

Merge branch 'master' into fix/header

Conflicts:
	src/ruby/ext/grpc/rb_grpc.c