Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorroot <root@node46.princeton.vicci.org>
Thu, 25 Sep 2014 03:59:30 +0000 (03:59 +0000)
committerroot <root@node46.princeton.vicci.org>
Thu, 25 Sep 2014 03:59:30 +0000 (03:59 +0000)

Trivial merge