Merge branch 'address_hint_api' into discovery

author Niklas Hofmann <niklas.hofmann@everbase.net>

Wed, 30 Jul 2014 23:51:55 +0000 (01:51 +0200)

committer Niklas Hofmann <niklas.hofmann@everbase.net>

Wed, 30 Jul 2014 23:51:55 +0000 (01:51 +0200)
author Niklas Hofmann <niklas.hofmann@everbase.net>
Wed, 30 Jul 2014 23:51:55 +0000 (01:51 +0200)
committer Niklas Hofmann <niklas.hofmann@everbase.net>
Wed, 30 Jul 2014 23:51:55 +0000 (01:51 +0200)
diff --cc src/meshlink.c
Simple merge
diff --cc src/meshlink.h
Simple merge
author	Niklas Hofmann <niklas.hofmann@everbase.net>
	Wed, 30 Jul 2014 23:51:55 +0000 (01:51 +0200)
committer	Niklas Hofmann <niklas.hofmann@everbase.net>
	Wed, 30 Jul 2014 23:51:55 +0000 (01:51 +0200)
		1	2
src/meshlink.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/meshlink.h	patch \|	diff1 \|	diff2 \|	blob \| history