tree 2d56bade7205322e7b00dc440687ad0683ce825b
parent cc0994c8cbd302aa99483e42d6d2855b0cd59fd4
parent fdd76ba414cde7e7ae827183fcf04c9b2874adf6
author Nicolas "Pixel" Noble <pixel@nobis-crew.org> 1421975178 +0100
committer Nicolas "Pixel" Noble <pixel@nobis-crew.org> 1421975178 +0100

Merge branch 'master' of github.com:google/grpc into vsprojects

Conflicts:
	templates/vsprojects/vs2013/grpc.sln.template