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

Trivial merge