Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorSapan Bhatia <sapanbhatia@nat-oitwireless-inside-vapornet100-c-32154.Princeton.EDU>
Wed, 19 Nov 2014 20:26:27 +0000 (15:26 -0500)
committerSapan Bhatia <sapanbhatia@nat-oitwireless-inside-vapornet100-c-32154.Princeton.EDU>
Wed, 19 Nov 2014 20:26:27 +0000 (15:26 -0500)

Trivial merge