Merge "Triple default $wgMaxShellMemory (raise to 300 MB)"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 25 Oct 2013 00:15:28 +0000 (00:15 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 25 Oct 2013 00:15:28 +0000 (00:15 +0000)

Trivial merge