Merge branch 'master' of git.vcholerae.com:arch/vibriocholera.com

4 jobs for master in 25 seconds (queued for 1 second)
Status Job ID Name Coverage
  Deploy
passed #31
fr.atc
job_deploy_fr

00:00:10

passed #29
us.atc
job_deploy_us

00:00:14

passed #28
fr.atc
job_deploy_fr

00:00:13

passed #30
fr.atc
job_deploy_fr

00:00:13