]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
Merge branch 'master' into trac3483
authorJeremy C. Reed <jreed@isc.org>
Wed, 24 Jun 2015 19:40:55 +0000 (19:40 +0000)
committerJeremy C. Reed <jreed@isc.org>
Wed, 24 Jun 2015 19:40:55 +0000 (19:40 +0000)
1  2 
Makefile.am
configure.ac

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