Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorScott Baker <smbaker@gmail.com>
Mon, 22 Dec 2014 16:32:02 +0000 (08:32 -0800)
committerScott Baker <smbaker@gmail.com>
Mon, 22 Dec 2014 16:32:02 +0000 (08:32 -0800)

Trivial merge