Fix indentation of custom option
Merge remote-tracking branch 'upstream/master' into bind
%P to %p for freebsd strftime compatiblity
%P to %p for freebsd strftime compatiblity
haproxy-devel, dont reload firewall rules every 2 minutes.
Merge pull request #611 from PiBa-NL/hap_reloadcheck

haproxy-devel, dont reload firewall rules every 2 minutes.
Merge pull request #607 from parawizard/master

Fix AM/PM date format to work with FreeBSD
Merge pull request #604 from crocomo/bind

bind - fix indentation of custom option