Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorScott Baker <smbaker@gmail.com>
Wed, 5 Nov 2014 19:06:10 +0000 (11:06 -0800)
committerScott Baker <smbaker@gmail.com>
Wed, 5 Nov 2014 19:06:10 +0000 (11:06 -0800)

Trivial merge