Merge branch 'master' of git.planet-lab.org:/git/plstackapi
authorSiobhan Tully <stully@verivue.com>
Sat, 11 Jan 2014 16:26:51 +0000 (11:26 -0500)
committerSiobhan Tully <stully@verivue.com>
Sat, 11 Jan 2014 16:26:51 +0000 (11:26 -0500)

Trivial merge