Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorScott Baker <smbaker@gmail.com>
Thu, 13 Mar 2014 22:14:32 +0000 (15:14 -0700)
committerScott Baker <smbaker@gmail.com>
Thu, 13 Mar 2014 22:14:32 +0000 (15:14 -0700)

Trivial merge