Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorScott Baker <smbaker@gmail.com>
Fri, 21 Nov 2014 00:50:49 +0000 (16:50 -0800)
committerScott Baker <smbaker@gmail.com>
Fri, 21 Nov 2014 00:50:49 +0000 (16:50 -0800)

Trivial merge