Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorScott Baker <smbaker@gmail.com>
Sun, 25 Jan 2015 19:50:02 +0000 (11:50 -0800)
committerScott Baker <smbaker@gmail.com>
Sun, 25 Jan 2015 19:50:02 +0000 (11:50 -0800)

Trivial merge