From: Tomek Mrugalski Date: Thu, 5 Jan 2017 14:42:39 +0000 (+0100) Subject: [master] Merge branch 'trac5032' (mac-sources, control-socket, relay parsers) X-Git-Tag: trac5044_base~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f1c9dee0936b48be28f890ffd428fbdeb87c12ea;p=thirdparty%2Fkea.git [master] Merge branch 'trac5032' (mac-sources, control-socket, relay parsers) # Conflicts: # src/lib/testutils/io_utils.cc # src/lib/testutils/io_utils.h --- f1c9dee0936b48be28f890ffd428fbdeb87c12ea