From: Niklas Hofmann Date: Fri, 8 Aug 2014 15:01:07 +0000 (+0200) Subject: Merge branch 'discovery' into everbase X-Git-Url: http://git.meshlink.io/?p=meshlink;a=commitdiff_plain;h=f28b9e011c448ea12e3801ee7b8d8e16bc7146a1 Merge branch 'discovery' into everbase --- f28b9e011c448ea12e3801ee7b8d8e16bc7146a1