Merge "Use PHP_OS rather than php_uname, which may be disabled"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 22 Apr 2015 20:19:52 +0000 (20:19 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 22 Apr 2015 20:19:52 +0000 (20:19 +0000)
1  2 
includes/GlobalFunctions.php

Simple merge