Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
Scott Baker [Tue, 20 Jan 2015 08:05:11 +0000 (00:05 -0800)]

Trivial merge