Merge pull request #13 from heil/master
authorNikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
Thu, 12 Jun 2014 16:53:18 +0000 (18:53 +0200)
committerNikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
Thu, 12 Jun 2014 16:53:18 +0000 (18:53 +0200)
haproxy: import from packages, add myself as the maintainer


Trivial merge