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

Trivial merge