From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 22 Apr 2015 20:19:52 +0000 (+0000)
Subject: Merge "Use PHP_OS rather than php_uname, which may be disabled"
X-Git-Tag: 1.31.0-rc.0~11619
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=979681f48871c16efd485e78d78f98c9a094212b;p=lhc%2Fweb%2Fwiklou.git

Merge "Use PHP_OS rather than php_uname, which may be disabled"
---

979681f48871c16efd485e78d78f98c9a094212b