Merging with HEAD
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Thu, 9 Jun 2011 13:06:22 +0000 (15:06 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Thu, 9 Jun 2011 13:06:22 +0000 (15:06 +0200)
1  2 
src/nepi/core/testbed_impl.py
src/nepi/testbeds/planetlab/execute.py

Simple merge