Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorScott Baker <smbaker@gmail.com>
Wed, 20 Aug 2014 19:33:37 +0000 (12:33 -0700)
committerScott Baker <smbaker@gmail.com>
Wed, 20 Aug 2014 19:33:37 +0000 (12:33 -0700)

Trivial merge