From: Steven Barth <steven@midlink.org>
Date: Sat, 31 Aug 2013 08:11:15 +0000 (+0200)
Subject: Merge branch 'hnet'
X-Git-Tag: debian/1.1+git20160131-1~133
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=commitdiff_plain;h=9c409ef5ce654ed5dd3ce706317eaac718a22983

Merge branch 'hnet'

Conflicts:
	src/ra.c
---

9c409ef5ce654ed5dd3ce706317eaac718a22983