Merge branch 'iotlab_fixes' into geni-v3
Loic Baron [Wed, 30 Jul 2014 14:40:15 +0000 (16:40 +0200)]
Conflicts:
sfa/iotlab/OARrestapi.py
sfa/iotlab/iotlabaggregate.py
sfa/iotlab/iotlabdriver.py
sfa/iotlab/iotlabshell.py
sfa/iotlab/iotlabslices.py

1  2 
sfa/iotlab/LDAPapi.py

Simple merge