Merge "Set timeout for AssembleUploadChunks.php."
authorMarkTraceur <mtraceur@member.fsf.org>
Wed, 9 Jan 2013 00:31:22 +0000 (00:31 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 9 Jan 2013 00:31:22 +0000 (00:31 +0000)

Trivial merge