Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
Scott Baker [Thu, 8 Jan 2015 16:59:52 +0000 (08:59 -0800)]

Trivial merge