From: Stanislav Malyshev <stas@php.net>
Date: Tue, 14 Apr 2015 07:08:57 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.4.40
X-Git-Tag: php-5.4.40~4^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa2eca2e4847439c0eb28dc8c2c3534083807e26;p=php

Merge branch 'PHP-5.4' into PHP-5.4.40

* PHP-5.4:
  fix CVE num
---

aa2eca2e4847439c0eb28dc8c2c3534083807e26