Merge branch 'hnet'
authorSteven Barth <steven@midlink.org>
Sat, 31 Aug 2013 08:11:15 +0000 (10:11 +0200)
committerSteven Barth <steven@midlink.org>
Sat, 31 Aug 2013 08:11:15 +0000 (10:11 +0200)
commit9c409ef5ce654ed5dd3ce706317eaac718a22983
tree91667e4ea5fc105e55343886c8ba3d7511e70441
parentd19d55cec4083b942a9e13a188659c7097d659d2
parente3e24645a00ff0aea4760265840bde21baeab3f1
Merge branch 'hnet'

Conflicts:
src/ra.c
README
src/odhcp6c.c
src/ra.c