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)
commita6d9810733f7d21fd43ba519dae5ccfcdc138095
treebe260c8ec6dd723e49640c4ccead400c03294241
parent0b02f81338d0a27c9a713427cd65443b58727f2f
parent02f42286da5bd6dbe62a31ea9b733ee3225903aa
Merge remote-tracking branch 'local_master/geni-v3' into geni-v3
sfa/planetlab/plslices.py