Merge "Fixed "getCachedWork" callback in thumb.php to avoid 404s in the stream method"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 30 Apr 2014 17:44:17 +0000 (17:44 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 30 Apr 2014 17:44:17 +0000 (17:44 +0000)
1  2 
thumb.php

diff --cc thumb.php
Simple merge