Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
Scott Baker [Tue, 6 Jan 2015 00:42:06 +0000 (16:42 -0800)]

Trivial merge