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

Trivial merge