[master] Finished merge of trac5277 (bootp parameters)

ChangeLog

@@ -1,3 +1,8 @@
+1326.	[func]		fdupont
+	server-hostname and boot-file-name are now allowed in global,
+	subnet4 and shared network scopes in DHCPv4.
+	(Trac #5277, git xxx)
+
 1325.	[bug]		marcin
 	Fixed a bug whereby a reserved address could be allocated to
 	a different client when this client explicitly requested