]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] Merge branch 'trac3292'
authorMarcin Siodelski <marcin@isc.org>
Wed, 22 Jan 2014 08:59:00 +0000 (09:59 +0100)
committerMarcin Siodelski <marcin@isc.org>
Wed, 22 Jan 2014 08:59:00 +0000 (09:59 +0100)
1  2 
src/bin/dhcp6/tests/config_parser_unittest.cc
src/lib/dhcp/option_definition.cc

Simple merge