Merge r63621 and r63636 from REL1_16:
authorBryan Tong Minh <btongminh@users.mediawiki.org>
Fri, 12 Mar 2010 18:26:12 +0000 (18:26 +0000)
committerBryan Tong Minh <btongminh@users.mediawiki.org>
Fri, 12 Mar 2010 18:26:12 +0000 (18:26 +0000)
commitdd349d7b3a882ea5b33c26b37eb2591f60ea79d3
tree61516c2f05e7984fb11ed11f6dabd8b10eb01f66
parent60df5636ccae6ce82921a37d8213ecd13840ed6c
Merge r63621 and r63636 from REL1_16:
* Rollback chunked uploading support for 1.16
*  Pass $sessionKey as parameter to UploadFromStash::initialize.
includes/AutoLoader.php
includes/api/ApiBase.php
includes/api/ApiUpload.php
includes/upload/UploadFromChunks.php [deleted file]
includes/upload/UploadFromStash.php