Merge remote-tracking branch 'up/master' into hnet
authorMarkus Stenberg <markus.stenberg@iki.fi>
Wed, 31 Jul 2013 21:58:33 +0000 (23:58 +0200)
committerMarkus Stenberg <markus.stenberg@iki.fi>
Wed, 31 Jul 2013 21:58:33 +0000 (23:58 +0200)
commit74ef11cad687fd165457f212cfe15bc5ad7a2cd1
tree690035ee4e4c4fbaa4c3c5426b2c194e6ec0bb8b
parent5217b2bb6c26f70f6fe570a340045a372020d06b
parentb5c20853fcbc081ad950ef2083a4f5c31d6ecb54
Merge remote-tracking branch 'up/master' into hnet
src/dhcpv6.c
src/odhcp6c.c
src/odhcp6c.h