Merge pull request #40 from heil/master
authorsbyx <steven@midlink.org>
Fri, 20 Jun 2014 11:39:28 +0000 (11:39 +0000)
committersbyx <steven@midlink.org>
Fri, 20 Jun 2014 11:39:28 +0000 (11:39 +0000)
haproxy: add upstream bugfix, adapt Copyright


Trivial merge