Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorScott Baker <smbaker@gmail.com>
Sat, 3 Jan 2015 20:29:43 +0000 (12:29 -0800)
committerScott Baker <smbaker@gmail.com>
Sat, 3 Jan 2015 20:29:43 +0000 (12:29 -0800)

Trivial merge