From: Christopher Jones <sixd@php.net>
Date: Fri, 16 Aug 2013 18:10:04 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
X-Git-Tag: php-5.5.6RC1~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1eadd156075b89cbbb3ef8f796da0fb572f09b34;p=php

Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  fix cve number
---

1eadd156075b89cbbb3ef8f796da0fb572f09b34