Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorTony Mack <tmack@paris.CS.Princeton.EDU>
Sat, 14 Dec 2013 03:42:39 +0000 (22:42 -0500)
committerTony Mack <tmack@paris.CS.Princeton.EDU>
Sat, 14 Dec 2013 03:42:39 +0000 (22:42 -0500)

Trivial merge