From: Johannes Schlüter <johannes@php.net>
Date: Wed, 16 May 2012 14:50:57 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~189^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=51e3e51d3b574519869bf21d0136b25f48ca7a99;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  PHP 5.3.15-dev
---

51e3e51d3b574519869bf21d0136b25f48ca7a99