Merge branch 'master' of git://git.planet-lab.org/plstackapi
Sapan Bhatia [Wed, 7 Jan 2015 06:11:47 +0000 (01:11 -0500)]

Trivial merge