Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorSapan Bhatia <gwsapan@gmail.com>
Tue, 14 Jan 2014 18:27:31 +0000 (13:27 -0500)
committerSapan Bhatia <gwsapan@gmail.com>
Tue, 14 Jan 2014 18:27:31 +0000 (13:27 -0500)

Trivial merge