From: Tomek Mrugalski <tomasz@isc.org>
Date: Tue, 1 Dec 2015 18:34:47 +0000 (+0100)
Subject: [master] Merge branch 'trac4121' (RAI option packed last)
X-Git-Tag: trac4231_base~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=286711d5056496647b3fb4deff27d8d9c201c784;p=thirdparty%2Fkea.git

[master] Merge branch 'trac4121' (RAI option packed last)

# Conflicts:
#	src/lib/dhcp/libdhcp++.cc
#	src/lib/dhcp/libdhcp++.h
---

286711d5056496647b3fb4deff27d8d9c201c784