Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorScott Baker <smbaker@gmail.com>
Mon, 22 Sep 2014 21:32:03 +0000 (14:32 -0700)
committerScott Baker <smbaker@gmail.com>
Mon, 22 Sep 2014 21:32:03 +0000 (14:32 -0700)

Trivial merge