Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch planetlab-4_0-branch
authorroot <root@devel.pl.sophia.inria.fr>
Fri, 17 Apr 2015 15:07:39 +0000 (17:07 +0200)
committerroot <root@devel.pl.sophia.inria.fr>
Fri, 17 Apr 2015 15:07:39 +0000 (17:07 +0200)

Trivial merge