From: Loic Baron <sandrine.avakian@inria.fr>
Date: Wed, 30 Jul 2014 14:40:15 +0000 (+0200)
Subject: Merge branch 'iotlab_fixes' into geni-v3
X-Git-Tag: sfa-3.1-10~4
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=95015fd08e08729c3aaeec2c000995595ea7a7e0

Merge branch 'iotlab_fixes' into geni-v3

Conflicts:
	sfa/iotlab/OARrestapi.py
	sfa/iotlab/iotlabaggregate.py
	sfa/iotlab/iotlabdriver.py
	sfa/iotlab/iotlabshell.py
	sfa/iotlab/iotlabslices.py
---

95015fd08e08729c3aaeec2c000995595ea7a7e0