haproxy-devel, made frontend merging in such a way that it is more obvious that a lot of settings are not needed for 'secondary' frontends.
Merge pull request #407 from PiBa-NL/haproxy-devel-2.1

haproxy-devel, made frontend merging hide more irrelevant settings
bandwidthd - rotate log files when output_cdf is enabled
bandwidthd - rotate log files when output_cdf is enabled

Improve the documentation of options on the GUI, including what happens when output_cdf is on.
Merge pull request #408 from phil-davis/master

bandwidthd - rotate log files when output_cdf is enabled
Correct descpriton