From: Saverio Proto <zioproto@gmail.com>
Date: Sun, 13 Apr 2014 10:41:45 +0000 (+0200)
Subject: Merge branch 'master' into saverio
X-Git-Url: http://git.meshlink.io/?p=meshlink;a=commitdiff_plain;h=fb7b6e7a0c966a88a682f656ca1caeb9a0583c5b

Merge branch 'master' into saverio

Conflicts:
	src/libmeshlink.c
---

fb7b6e7a0c966a88a682f656ca1caeb9a0583c5b