From: Tomek Mrugalski <tomasz@isc.org>
Date: Tue, 3 Oct 2017 18:21:47 +0000 (+0200)
Subject: [master] Merge branch 'trac5343' (dead code removal)
X-Git-Tag: trac5361_base~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a9fd9c5159a1991fe65d67a0552f37eef58bf8c;p=thirdparty%2Fkea.git

[master] Merge branch 'trac5343' (dead code removal)

# Conflicts:
#	src/bin/dhcp6/json_config_parser.cc
---

7a9fd9c5159a1991fe65d67a0552f37eef58bf8c