<NME> haproxy
<BEF> ADDFILE
<MSG> Merge pull request #377 from infosiftr/haproxy

Add haproxy (1.4 and 1.5)
<DFF> @@ -0,0 +1,9 @@
+# maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
+
+1.4.25: git://github.com/docker-library/haproxy@40cd6587e7da3d247ab2e9fede5021f30a1e773e 1.4
+1.4: git://github.com/docker-library/haproxy@40cd6587e7da3d247ab2e9fede5021f30a1e773e 1.4
+
+1.5.9: git://github.com/docker-library/haproxy@40cd6587e7da3d247ab2e9fede5021f30a1e773e 1.5
+1.5: git://github.com/docker-library/haproxy@40cd6587e7da3d247ab2e9fede5021f30a1e773e 1.5
+1: git://github.com/docker-library/haproxy@40cd6587e7da3d247ab2e9fede5021f30a1e773e 1.5
+latest: git://github.com/docker-library/haproxy@40cd6587e7da3d247ab2e9fede5021f30a1e773e 1.5

Merge pull request #377 from infosiftr/haproxy