From: Niklas Hofmann <niklas.hofmann@everbase.net>
Date: Fri, 8 Aug 2014 14:12:41 +0000 (+0200)
Subject: Merge branch 'discovery' into everbase
X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=ebec33ff3fbf40b70e14a2f1ea1ccf7f78e7bb96;p=meshlink

Merge branch 'discovery' into everbase
---

ebec33ff3fbf40b70e14a2f1ea1ccf7f78e7bb96