From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Wed, 31 Jul 2013 21:58:33 +0000 (+0200)
Subject: Merge remote-tracking branch 'up/master' into hnet
X-Git-Tag: debian/1.1+git20160131-1~133^2~1
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=74ef11cad687fd165457f212cfe15bc5ad7a2cd1;p=odhcp6c.git

Merge remote-tracking branch 'up/master' into hnet
---

74ef11cad687fd165457f212cfe15bc5ad7a2cd1