Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorScott Baker <smbaker@gmail.com>
Tue, 22 Apr 2014 00:32:23 +0000 (17:32 -0700)
committerScott Baker <smbaker@gmail.com>
Tue, 22 Apr 2014 00:32:23 +0000 (17:32 -0700)

Trivial merge