haproxy-devel:
 - final 1.5.0
Merge branch 'master' of github.com:heil/owrt-package

Conflicts:
	net/haproxy-devel/Makefile