Merge "reinstating Change Ifb1f6125..."
authorKaldari <rkaldari@wikimedia.org>
Thu, 18 Oct 2012 00:32:56 +0000 (00:32 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 18 Oct 2012 00:32:56 +0000 (00:32 +0000)
commit5c8057bdcd6960e83899ed9cb2ea9d809d825871
treed5a9b48187a587d74a4229ff1bee28474137cef3
parent7d4c391e2574ed3f64fd13d304aa6c38214551ed
parent18fabfaa3e6a34b7d8a2b53deed0e4c637b203f8
Merge "reinstating Change Ifb1f6125..."
includes/DefaultSettings.php
includes/specials/SpecialUpload.php