Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorScott Baker <smbaker@gmail.com>
Wed, 16 Apr 2014 00:53:38 +0000 (17:53 -0700)
committerScott Baker <smbaker@gmail.com>
Wed, 16 Apr 2014 00:53:38 +0000 (17:53 -0700)

Trivial merge