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

Trivial merge