Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
Scott Baker [Wed, 7 Jan 2015 06:22:25 +0000 (22:22 -0800)]

Trivial merge