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

Trivial merge