Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorScott Baker <smbaker@gmail.com>
Mon, 14 Apr 2014 16:29:42 +0000 (09:29 -0700)
committerScott Baker <smbaker@gmail.com>
Mon, 14 Apr 2014 16:29:42 +0000 (09:29 -0700)

Trivial merge