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

Trivial merge