Merge "Use lower memory limits"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 22 Nov 2013 21:34:25 +0000 (21:34 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 22 Nov 2013 21:34:25 +0000 (21:34 +0000)

Trivial merge