Merge pull request #39 from heil/master
authorsbyx <steven@midlink.org>
Thu, 19 Jun 2014 21:54:51 +0000 (21:54 +0000)
committersbyx <steven@midlink.org>
Thu, 19 Jun 2014 21:54:51 +0000 (21:54 +0000)
haproxy: upgrade haproxy to version 1.5.0


Trivial merge