Leonid Bugaev 5cc4228dcd Merge branch 'master' into input-modifier ...

Conflicts:
	Dockerfile
	emitter.go
	http_client.go
	plugins.go
	proto/proto.go

2015-07-21 09:49:37 +05:00

..

proto_test.go

Improve style and docs for proto package

2015-07-13 09:31:11 +05:00

proto.go

Merge branch 'master' into input-modifier

2015-07-21 09:49:37 +05:00