Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi into HEAD
authorSapan Bhatia <sapanb@cs.princeton.edu>
Tue, 16 Dec 2014 06:09:35 +0000 (01:09 -0500)
committerSapan Bhatia <sapanb@cs.princeton.edu>
Tue, 16 Dec 2014 06:09:35 +0000 (01:09 -0500)

Trivial merge