]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
Merge branch 'trac3483'
authorJeremy C. Reed <jreed@isc.org>
Tue, 8 Sep 2015 12:57:41 +0000 (08:57 -0400)
committerJeremy C. Reed <jreed@isc.org>
Tue, 8 Sep 2015 12:57:41 +0000 (08:57 -0400)
1  2 
Makefile.am
configure.ac

diff --cc Makefile.am
Simple merge
diff --cc configure.ac
Simple merge