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)
1  2 
RELEASE-NOTES-1.21
includes/DefaultSettings.php
includes/GlobalFunctions.php

Simple merge
Simple merge
Simple merge