From: Anatol Belski <ab@php.net>
Date: Wed, 10 Jun 2015 09:26:49 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0alpha2~2^2~182
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=23e8956386a539b482653dbe89d1fcb1122a8a9a;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  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"
---

23e8956386a539b482653dbe89d1fcb1122a8a9a