Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
Scott Baker [Tue, 13 Jan 2015 03:47:54 +0000 (19:47 -0800)]

Trivial merge