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

Merge branch 'everbase' into discovery
---

39193ebcc7173db117cce01bc0809e727a0c21c1