Merge branch 'master' of git.planet-lab.org:/git/plstackapi
authorDavid Payne <paynedw2@gmail.com>
Tue, 22 Apr 2014 22:00:35 +0000 (18:00 -0400)
committerDavid Payne <paynedw2@gmail.com>
Tue, 22 Apr 2014 22:00:35 +0000 (18:00 -0400)

Trivial merge