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

Trivial merge