Merge remote-tracking branch 'origin/flab' into generic
authorGit User <support@planet-lab.org>
Tue, 14 Oct 2014 07:18:43 +0000 (03:18 -0400)
committerGit User <support@planet-lab.org>
Tue, 14 Oct 2014 07:18:43 +0000 (03:18 -0400)

Trivial merge