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)
commit87d5136edf8998f032e7e73d0f2b9a74f70c399b
tree6c603d510ac3727801fab37db684910564eb39bb
parent7d766208a84d4c222205b6ac0575f5672864327d
parent9501ca562faae1fed5a93d3fd6c6b0bde29fe894
Merge pull request #40 from heil/master

haproxy: add upstream bugfix, adapt Copyright