]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] Merge branch 'trac3161'
authorMarcin Siodelski <marcin@isc.org>
Fri, 16 Sep 2016 14:25:20 +0000 (16:25 +0200)
committerMarcin Siodelski <marcin@isc.org>
Fri, 16 Sep 2016 14:25:20 +0000 (16:25 +0200)
1  2 
src/bin/dhcp4/dhcp4_srv.cc
src/lib/dhcpsrv/pgsql_host_data_source.cc

Simple merge