Merge branch 'discovery' of chicago.everbase.net:meshlink/meshlink into everbase

author Guus Sliepen <guus@meshlink.io>

Sat, 9 Aug 2014 08:21:00 +0000 (10:21 +0200)

committer Guus Sliepen <guus@meshlink.io>

Sat, 9 Aug 2014 08:21:00 +0000 (10:21 +0200)
author Guus Sliepen <guus@meshlink.io>
Sat, 9 Aug 2014 08:21:00 +0000 (10:21 +0200)
committer Guus Sliepen <guus@meshlink.io>
Sat, 9 Aug 2014 08:21:00 +0000 (10:21 +0200)
diff --cc src/meshlink.c
Simple merge
diff --cc src/meshlink.h
Simple merge
author	Guus Sliepen <guus@meshlink.io>
	Sat, 9 Aug 2014 08:21:00 +0000 (10:21 +0200)
committer	Guus Sliepen <guus@meshlink.io>
	Sat, 9 Aug 2014 08:21:00 +0000 (10:21 +0200)
		1	2
src/meshlink.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/meshlink.h	patch \|	diff1 \|	diff2 \|	blob \| history