From: Saverio Proto <zioproto@gmail.com>
Date: Wed, 11 Jun 2014 17:58:53 +0000 (+0200)
Subject: Merge branch 'master' into testing/invitations
X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=e9ea74ec1b656ba663d94fb3cf99a5837f170be7;p=meshlink

Merge branch 'master' into testing/invitations
---

e9ea74ec1b656ba663d94fb3cf99a5837f170be7