[master] Merge branch 'trac2994' (Initial hooks for DHCPv4 server)
Conflicts: ChangeLog src/bin/dhcp4/dhcp4_messages.mes src/bin/dhcp4/dhcp4_srv.cc src/bin/dhcp4/dhcp4_srv.h
This diff is collapsed.
Conflicts: ChangeLog src/bin/dhcp4/dhcp4_messages.mes src/bin/dhcp4/dhcp4_srv.cc src/bin/dhcp4/dhcp4_srv.h