Merge "Improve the shell cgroup feature"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 7 Feb 2013 18:40:49 +0000 (18:40 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 7 Feb 2013 18:40:49 +0000 (18:40 +0000)
commita87e2ea37a7d9bc1989ec951e8565da21319ba66
treec81f2ee8db0dad4bc655088cc39a68cf11d907dc
parentea0776b1e8a635f1c3e8dbe9149c06b1dac71be3
parent674962b339795029e0bf404563288a919605bfc6
Merge "Improve the shell cgroup feature"
RELEASE-NOTES-1.21
includes/DefaultSettings.php
includes/GlobalFunctions.php