From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 31 Jul 2013 10:24:30 +0000 (+0400)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~366^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2a433fc5da5ff608386ef0e8356e8699d14fba9;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
  added test script for bug65045.
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.

Conflicts:
	NEWS
---

e2a433fc5da5ff608386ef0e8356e8699d14fba9