Merge "Support rate-limiting thumbnail generation"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 16 Oct 2013 17:31:50 +0000 (17:31 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 16 Oct 2013 17:31:50 +0000 (17:31 +0000)
1  2 
includes/DefaultSettings.php
thumb.php

Simple merge
diff --cc thumb.php
Simple merge