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

Trivial merge