From: Anatol Belski <ab@php.net>
Date: Wed, 10 Jun 2015 09:25:21 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.11RC1~13^2~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=64df05d5b1908314fae212fcaf8632a68bd9996d;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated NEWS
  Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
  Revert "Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business""
  Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
---

64df05d5b1908314fae212fcaf8632a68bd9996d