Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorScott Baker <smbaker@gmail.com>
Thu, 9 Oct 2014 18:00:45 +0000 (11:00 -0700)
committerScott Baker <smbaker@gmail.com>
Thu, 9 Oct 2014 18:00:45 +0000 (11:00 -0700)

Trivial merge