Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorTony Mack <tmack@tux.cs.princeton.edu>
Mon, 26 Jan 2015 02:59:58 +0000 (21:59 -0500)
committerTony Mack <tmack@tux.cs.princeton.edu>
Mon, 26 Jan 2015 02:59:58 +0000 (21:59 -0500)

Trivial merge