]> git.ipfire.org Git - thirdparty/kea.git/commit
[master] Merge branch 'trac5303'
authorMarcin Siodelski <marcin@isc.org>
Thu, 29 Jun 2017 15:53:18 +0000 (17:53 +0200)
committerMarcin Siodelski <marcin@isc.org>
Thu, 29 Jun 2017 15:53:18 +0000 (17:53 +0200)
commitb3113da16eb5c6fa323068f0a57dfa30f42893d2
tree25dbca21fa3bf9a9cdc7125ba22efda1837c122c
parent48113aba218603afac4d457075458d4988e4082b
parent547a90cb49324d268f33ea76f69bb68813c0db9e
[master] Merge branch 'trac5303'

# Conflicts:
# src/lib/http/connection.cc