Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorScott Baker <smbaker@gmail.com>
Fri, 5 Dec 2014 06:11:00 +0000 (22:11 -0800)
committerScott Baker <smbaker@gmail.com>
Fri, 5 Dec 2014 06:11:00 +0000 (22:11 -0800)

Trivial merge