From: Loic Baron <loic.baron@lip6.fr>
Date: Mon, 22 May 2017 13:52:38 +0000 (+0200)
Subject: Merge branch 'master' of git://git.onelab.eu/sfa
X-Git-Tag: sfa-4.0-2~19
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=65866811e8df57c89f3487db047b5653f306a3c8

Merge branch 'master' of git://git.onelab.eu/sfa

Conflicts:
	sfa/iotlab/iotlabshell.py
---

65866811e8df57c89f3487db047b5653f306a3c8