Merge branch 'trac1230'

Conflicts:
	ChangeLog
	src/lib/dhcp/iface_mgr.h

diff --cc ChangeLog
index ff15bf746b9b40ebc757caf1b2a73c07176763d1,3f64bba193574032a96c4036794417de5cfbda54..0892d4c3aa696e79273829e7f335623ccddc4fa3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,9 +1,9 @@@
 -      (Trac #1230, git TBD)
+ 363.  [func]          tomek
+       dhcp4: Support for DISCOVER and OFFER implemented. b10-dhcp4 is
+       now able to offer hardcoded leases to DHCPv4 clients.
+       dhcp6: Code refactored to use the same approach as dhcp4.
++      (Trac #1230, git aac05f566c49daad4d3de35550cfaff31c124513)
+ 
  362.  [func]          tomek
        libdhcp++: Interface detection in Linux implemented. libdhcp++
        if now able to detect available network interfaces, its link-layer

diff --cc src/lib/dhcp/iface_mgr.cc
Simple merge

diff --cc src/lib/dhcp/iface_mgr.h
Simple merge

diff --cc src/lib/dhcp/tests/iface_mgr_unittest.cc
Simple merge