[master] Merge branch 'trac3604'

author Marcin Siodelski <marcin@isc.org>

Fri, 13 Feb 2015 13:21:45 +0000 (14:21 +0100)

committer Marcin Siodelski <marcin@isc.org>

Fri, 13 Feb 2015 13:21:45 +0000 (14:21 +0100)
author Marcin Siodelski <marcin@isc.org>
Fri, 13 Feb 2015 13:21:45 +0000 (14:21 +0100)
committer Marcin Siodelski <marcin@isc.org>
Fri, 13 Feb 2015 13:21:45 +0000 (14:21 +0100)
diff --cc src/lib/dhcpsrv/Makefile.am
Simple merge
diff --cc src/lib/dhcpsrv/dhcpsrv_messages.mes
Simple merge
diff --cc src/lib/dhcpsrv/tests/Makefile.am
Simple merge
author	Marcin Siodelski <marcin@isc.org>
	Fri, 13 Feb 2015 13:21:45 +0000 (14:21 +0100)
committer	Marcin Siodelski <marcin@isc.org>
	Fri, 13 Feb 2015 13:21:45 +0000 (14:21 +0100)
		1	2
src/lib/dhcpsrv/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/dhcpsrv_messages.mes	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/tests/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history