Merge "Generate thumbnails based on buckets"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 9 Jul 2014 14:09:02 +0000 (14:09 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 9 Jul 2014 14:09:02 +0000 (14:09 +0000)
1  2 
includes/DefaultSettings.php
includes/media/Bitmap.php
includes/media/MediaHandler.php

Simple merge
Simple merge
Simple merge