tree b0f5e3c9f9bf9097f739b98d0503d659abe974a9
parent 5e933847cc9e7826f1a9ee8b3dc1df4960b1ea5d
author alien <the-alien@live.ru> 1458217144 +0300
committer alien <the-alien@live.ru> 1458331190 +0300

csharp: add support for the json_name option

Conflicts:
	csharp/src/Google.Protobuf/JsonFormatter.cs