Merge "Indicate the actual version of HHVM in use"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 27 Aug 2014 22:42:12 +0000 (22:42 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 27 Aug 2014 22:42:12 +0000 (22:42 +0000)
1  2 
includes/api/ApiQuerySiteinfo.php
includes/debug/MWDebug.php
includes/installer/Installer.php
includes/installer/i18n/en.json
includes/installer/i18n/qqq.json
includes/specials/SpecialVersion.php

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge