From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 23 Dec 2013 08:52:27 +0000 (+0400)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~353^2~109
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5bc9e006e89954dc4e26b1bea945a22d5c24a231;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
  fix news
  opcodes
  opcodes

Conflicts:
	NEWS
---

5bc9e006e89954dc4e26b1bea945a22d5c24a231