]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] Merge branch 'github22'
authorMarcin Siodelski <marcin@isc.org>
Thu, 1 Sep 2016 16:03:04 +0000 (18:03 +0200)
committerMarcin Siodelski <marcin@isc.org>
Thu, 1 Sep 2016 16:03:04 +0000 (18:03 +0200)
1  2 
configure.ac
src/bin/perfdhcp/perfdhcp.xml

diff --cc configure.ac
Simple merge
Simple merge