Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
Scott Baker [Sun, 25 Jan 2015 19:50:02 +0000 (11:50 -0800)]

Trivial merge