From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 15 Apr 2013 08:09:02 +0000 (+0400)
Subject: Merge branch 'PHP-5.5' into PHP-5.5-opcache
X-Git-Tag: php-5.6.0alpha1~448^2~34^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e16f24327dd756f81997bf714e0dc28f63a1dc0c;p=php

Merge branch 'PHP-5.5' into PHP-5.5-opcache

* PHP-5.5:
  allow lcov 1.10
  Fixed bug (Wrong ce cached)
  apply change from opcache readme to php.ini
  lucky that the name is not used, fix name of encoder
---

e16f24327dd756f81997bf714e0dc28f63a1dc0c