Merge "thumb.php and img_auth.php cleanups"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 21 Apr 2014 17:50:32 +0000 (17:50 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 21 Apr 2014 17:50:32 +0000 (17:50 +0000)
1  2 
thumb.php

diff --cc thumb.php
Simple merge