From: Johannes Schlüter <johannes@php.net>
Date: Wed, 7 Nov 2012 23:04:08 +0000 (+0100)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.6.0alpha1~711^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e383d4d20ddeb908569c5ad8cd4772c738f2db99;p=php

Merge branch 'PHP-5.4'
---

e383d4d20ddeb908569c5ad8cd4772c738f2db99