Merge "limit memory via cgroups if available"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 5 Feb 2013 22:56:16 +0000 (22:56 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 5 Feb 2013 22:56:16 +0000 (22:56 +0000)

Trivial merge