Merge branch 'master' into hnet
authorMarkus Stenberg <markus.stenberg@iki.fi>
Mon, 24 Jun 2013 10:53:03 +0000 (13:53 +0300)
committerMarkus Stenberg <markus.stenberg@iki.fi>
Mon, 24 Jun 2013 10:53:38 +0000 (13:53 +0300)
commiteb0b01e94374774609c31ab4508d8cfca8a400e1
tree3f737f5f1b3bba085197e28977172218150346e5
parent78db615ec88b899b047a0f47eb74e9ef0ff5a7fe
parenteaf3a11cad8a5dd389d5f52cc76e424e0242074b
Merge branch 'master' into hnet

Conflicts:
README
src/dhcpv6.c
src/odhcp6c.h
README
src/dhcpv6.c
src/odhcp6c.c
src/odhcp6c.h
src/ra.c
src/script.c