From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 30 Jul 2013 13:36:47 +0000 (+0400)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~369
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0aa342e903bf012efe03db1e9f1fe4ed54225e76;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).

Conflicts:
	NEWS
---

0aa342e903bf012efe03db1e9f1fe4ed54225e76