Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorScott Baker <smbaker@gmail.com>
Tue, 20 Jan 2015 21:30:49 +0000 (13:30 -0800)
committerScott Baker <smbaker@gmail.com>
Tue, 20 Jan 2015 21:30:49 +0000 (13:30 -0800)

Trivial merge