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

author Markus Stenberg <markus.stenberg@iki.fi>

Wed, 31 Jul 2013 21:58:33 +0000 (23:58 +0200)

committer Markus Stenberg <markus.stenberg@iki.fi>

Wed, 31 Jul 2013 21:58:33 +0000 (23:58 +0200)
author Markus Stenberg <markus.stenberg@iki.fi>
Wed, 31 Jul 2013 21:58:33 +0000 (23:58 +0200)
committer Markus Stenberg <markus.stenberg@iki.fi>
Wed, 31 Jul 2013 21:58:33 +0000 (23:58 +0200)
diff --cc src/dhcpv6.c
Simple merge
diff --cc src/odhcp6c.c
Simple merge
diff --cc src/odhcp6c.h
Simple merge
author	Markus Stenberg <markus.stenberg@iki.fi>
	Wed, 31 Jul 2013 21:58:33 +0000 (23:58 +0200)
committer	Markus Stenberg <markus.stenberg@iki.fi>
	Wed, 31 Jul 2013 21:58:33 +0000 (23:58 +0200)
		1	2
src/dhcpv6.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/odhcp6c.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/odhcp6c.h	patch \|	diff1 \|	diff2 \|	blob \| history