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

Conflicts:
	ChangeLog

diff --cc ChangeLog
index be84ebb2e2c1b845db6aa08f1fee1809c34b6d1d,b1f56a7b48783070d5aa35ea3311dd679f755da7..ec6c8d69a5a8d7f0ec9913f967ce43266d95774d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,9 +1,16 @@@
- 749.  [func]          tomek
++750.  [func]          tomek
 +      b10-dhcp4, b10-dhcp6: Simple client classification has been
 +      implemented. Incoming packets can be assigned to zero or more
 +      client classes. It is possible to restrict subnet usage to a given
 +      client class. User's Guide and Developer's Guide has been updated.
 +      (Trac #3274, git 1791d19899b92a6ee411199f664bdfc690ec08b2)
 +
+ 749.  [bug]           tmark
+       b10-dhcp-ddns now sets the TTL value in RRs that add A, AAAA, or PTR DNS
+       entries to the lease length provided in instigating NameChangeRequest.
+       This corrected a bug in which the TTL was always set to 0.
+       (Trac# 3299, git dbacf27ece77f3d857da793341c6bd31ef1ea239)
+ 
  748.  [bug]           marcin
        b10-dhcp4 server picks a subnet, to assign address for a directly
        connected client, using IP address of the interface on which the