Nicolas Noble fee065c1c7 Merge branch 'master' of github.com:google/grpc into json ... Conflicts: src/core/security/credentials.c		2015-01-26 11:41:12 -08:00
..
gflags@05b155ff59	Renaming libevent to event2, and adding gflags submodule.	2014-12-10 14:24:07 -08:00
openssl@4ac0329582	OpenSSL 1.0.2 is out of beta - let's update our own repositories to reflect that.	2015-01-23 20:53:57 +01:00
protobuf@644a6a1da7	Updated protobuf: it now includes the official ruby-protobuf	2015-01-05 15:39:23 -08:00
zlib@5089329162	Adding third-party submodules.	2014-12-08 16:39:50 -08:00