Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorScott Baker <smbaker@gmail.com>
Tue, 2 Sep 2014 18:52:12 +0000 (11:52 -0700)
committerScott Baker <smbaker@gmail.com>
Tue, 2 Sep 2014 18:52:12 +0000 (11:52 -0700)

Trivial merge