Merge remote-tracking branch 'local_master/geni-v3' into geni-v3
authorGit User <support@planet-lab.org>
Sun, 10 Nov 2013 22:59:07 +0000 (17:59 -0500)
committerGit User <support@planet-lab.org>
Sun, 10 Nov 2013 22:59:07 +0000 (17:59 -0500)
1  2 
sfa/planetlab/plslices.py

Simple merge