Merge "Make sure that the temp zone has an .htaccess file"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 6 Nov 2014 19:09:43 +0000 (19:09 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 6 Nov 2014 19:09:43 +0000 (19:09 +0000)

Trivial merge