Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorScott Baker <smbaker@gmail.com>
Wed, 14 Jan 2015 23:44:58 +0000 (15:44 -0800)
committerScott Baker <smbaker@gmail.com>
Wed, 14 Jan 2015 23:44:58 +0000 (15:44 -0800)

Trivial merge