From: Marcin Siodelski <marcin@isc.org>
Date: Thu, 29 Jun 2017 15:53:18 +0000 (+0200)
Subject: [master] Merge branch 'trac5303'
X-Git-Tag: trac5286_base~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3113da16eb5c6fa323068f0a57dfa30f42893d2;p=thirdparty%2Fkea.git

[master] Merge branch 'trac5303'

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

b3113da16eb5c6fa323068f0a57dfa30f42893d2