Merge remote-tracking branch 'origin/geni-v3' into geni-v3
authorGit User <support@planet-lab.org>
Thu, 14 Nov 2013 07:34:43 +0000 (02:34 -0500)
committerGit User <support@planet-lab.org>
Thu, 14 Nov 2013 07:34:43 +0000 (02:34 -0500)
1  2 
sfa/planetlab/plslices.py

Simple merge