Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorScott Baker <smbaker@gmail.com>
Mon, 27 Oct 2014 22:42:40 +0000 (15:42 -0700)
committerScott Baker <smbaker@gmail.com>
Mon, 27 Oct 2014 22:42:40 +0000 (15:42 -0700)

Trivial merge