Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.gitignore
#	README.md
#	balancer.go
#	commands.go
#	config.go
#	error_test.go
#	pipe_factory_test.go
#	pool.go
#	socket_factory.go
#	socket_factory_test.go
#	state_test.go
#	tests/client.php
#	worker.go
#	worker_test.go

0 files changed, 0 insertions, 0 deletions