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

Trivial merge