Merge branch 'master' of ssh://git.kea.isc.org/git/kea

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 04bc368b3e5870f91bd0eee1aba84d1daf0b15c4,e5157ddbb5ef648fa83af419b8d9db054e80c232..389fa5ac038121af6b84d0648418f60c3e8b0420
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,8 +1,13 @@@
- 1120. [bug]           sar
++1121. [bug]           sar
 +      Update the classification document to match the output from
 +      the debug statements.
 +      (Trac NA, git TBD)
 +
+ 1120. [func]          marcin
+       Extended MySQL host data source to retrieve DHCPv4 and DHCPv6
+       options associated with hosts from a MySQL database.
+       (Trac #4281, git b8a306a27d1cae03f6bc5223c30806f5cd1b64f4)
+ 
  1119. [func]          sar
        Add debug logging to the classification tokens.  This uses
        the loggers "kea-dhcp4.eval" and "kea-dhcp6.eval" to capture