Update composer.json
Merge branch 'master' of github.com:t4g/HAProxy

Conflicts:
	composer.json