[master] Merge branch 'trac3551' (RFC6939 support)

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 8810d9e1ad853627cbfe9940878734e021172910,6d0c9528d0099807d75443ce3811ea68f9cd9da2..8f8cd7b1d4ed3b93bcf5e454124d5bb74bc91d05
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,12 @@@
 -6XX.  [func]          dgutier
++862.  [func]          dgutier, tomek
+       Support for client link-layer address option (RFC6939) has
+       been added.
 -      (Trac #3551, git abcd)
++      (Trac #3551, git dabdf965d92085f86d5e96c8dadce0f0a8f7c8e3)
++
 +861.  [func]          marcin
 +      The configuration parameters for a DHCPv4 and DHCPv6 options are now
 +      optional.
 +      (Trac #3467, git 7bf8cef161e6dd00a7f2b2fe8ec04e1958d6db3f)
  
  860.  [bug]           marcin
        Fixed calculation of the Client FQDN option length for the ASCII

diff --cc doc/guide/dhcp6-srv.xml
Simple merge