Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorScott Baker <smbaker@gmail.com>
Thu, 4 Sep 2014 00:24:03 +0000 (17:24 -0700)
committerScott Baker <smbaker@gmail.com>
Thu, 4 Sep 2014 00:24:03 +0000 (17:24 -0700)

Trivial merge