Merge remote-tracking branch 'local_master/geni-v3' into geni-v3
authorGit User <support@planet-lab.org>
Thu, 16 Aug 2012 19:51:38 +0000 (15:51 -0400)
committerGit User <support@planet-lab.org>
Thu, 16 Aug 2012 19:51:38 +0000 (15:51 -0400)
commitdb5e2034e15c72434fdf67ee40d32b980f971705
tree2669028b8685082cc0c8b9c426c10ca19d2f1cff
parentcdb2156adc15147639db8831eb027ab9c3b9d475
parentffa69a49ba4e8a122241c5b4843baf758e7c0c93
Merge remote-tracking branch 'local_master/geni-v3' into geni-v3