Merge "Fixed and suppressed some thumb.php IDEA errors"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 1 Sep 2015 00:45:12 +0000 (00:45 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 1 Sep 2015 00:45:12 +0000 (00:45 +0000)
1  2 
thumb.php

diff --cc thumb.php
Simple merge