Merge branch 'master' of git.planet-lab.org:/git/plstackapi
authorSiobhan Tully <stully@verivue.com>
Fri, 5 Jul 2013 15:14:09 +0000 (11:14 -0400)
committerSiobhan Tully <stully@verivue.com>
Fri, 5 Jul 2013 15:14:09 +0000 (11:14 -0400)

Trivial merge