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)
Conflicts:
src/ra.c

1  2 
README
src/odhcp6c.c
src/ra.c

diff --cc README
Simple merge
diff --cc src/odhcp6c.c
Simple merge
diff --cc src/ra.c
Simple merge