Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
Scott Baker [Sat, 17 Jan 2015 03:15:20 +0000 (19:15 -0800)]

Trivial merge