From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Thu, 1 Aug 2013 09:05:56 +0000 (+0200)
Subject: Merge remote-tracking branch 'up/master' into hnet
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e3e24645a00ff0aea4760265840bde21baeab3f1;p=project%2Fodhcp6c.git

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

e3e24645a00ff0aea4760265840bde21baeab3f1