From: Johannes Schlüter <johannes@php.net>
Date: Tue, 8 May 2012 09:50:19 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~227
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e96d7cd5ef255b1152ec8312145195dc4b3be6c;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  This will be PHP 5.3.14
  improve fix for CVE-2012-1823
  improve fix for CVE-2012-1823
---

6e96d7cd5ef255b1152ec8312145195dc4b3be6c