Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
Scott Baker [Wed, 14 Jan 2015 23:44:58 +0000 (15:44 -0800)]

Trivial merge