[3968] Merge branch 'master' into trac3968

author Marcin Siodelski <marcin@isc.org>

Thu, 15 Oct 2015 17:59:12 +0000 (19:59 +0200)

committer Marcin Siodelski <marcin@isc.org>

Thu, 15 Oct 2015 17:59:12 +0000 (19:59 +0200)
author Marcin Siodelski <marcin@isc.org>
Thu, 15 Oct 2015 17:59:12 +0000 (19:59 +0200)
committer Marcin Siodelski <marcin@isc.org>
Thu, 15 Oct 2015 17:59:12 +0000 (19:59 +0200)
diff --cc src/bin/admin/scripts/mysql/dhcpdb_create.mysql
Simple merge
author	Marcin Siodelski <marcin@isc.org>
	Thu, 15 Oct 2015 17:59:12 +0000 (19:59 +0200)
committer	Marcin Siodelski <marcin@isc.org>
	Thu, 15 Oct 2015 17:59:12 +0000 (19:59 +0200)