]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
Merge remote branch 'remotes/origin/trac3520'
authorJeremy C. Reed <jreed@isc.org>
Thu, 5 Feb 2015 15:34:32 +0000 (10:34 -0500)
committerJeremy C. Reed <jreed@isc.org>
Thu, 5 Feb 2015 15:34:32 +0000 (10:34 -0500)
1  2 
configure.ac
doc/guide/Makefile.am

diff --cc configure.ac
Simple merge
Simple merge