Merge "images/.htaccess breaks TransformVia404 functionality"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 27 Jan 2016 00:45:24 +0000 (00:45 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 27 Jan 2016 00:45:24 +0000 (00:45 +0000)

Trivial merge