]> git.ipfire.org Git - thirdparty/kea.git/commit
[master] Merge branch 'trac3806'
authorMarcin Siodelski <marcin@isc.org>
Fri, 15 May 2015 13:02:48 +0000 (15:02 +0200)
committerMarcin Siodelski <marcin@isc.org>
Fri, 15 May 2015 13:02:48 +0000 (15:02 +0200)
commit7b148c2dd5e2696a541883223ce1efd2de81f143
treeffd66482e6769d39a7492d8545943a8b1308ea24
parent642d01fd32167f33175c42b2ae4636a789570975
parent012a2dd1075c22b897ba506701e61895551047b7
[master] Merge branch 'trac3806'

# Conflicts:
# doc/guide/logging.xml
doc/guide/logging.xml
src/bin/dhcp4/dhcp4_srv.cc