From: Guus Sliepen <guus@meshlink.io>
Date: Sat, 9 Aug 2014 08:21:00 +0000 (+0200)
Subject: Merge branch 'discovery' of chicago.everbase.net:meshlink/meshlink into everbase
X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=ae1d95cee66f3e5c6475f03b441d455e436e9ee8;p=meshlink

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

ae1d95cee66f3e5c6475f03b441d455e436e9ee8