Merge "Have separate timeouts for upload by url ($wgCopyUpload[Async]Timeout)"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 8 Aug 2013 17:05:47 +0000 (17:05 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 8 Aug 2013 17:05:47 +0000 (17:05 +0000)
1  2 
RELEASE-NOTES-1.22

Simple merge