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

Trivial merge