From: Johannes Schlüter <johannes@php.net>
Date: Wed, 10 Apr 2013 07:48:15 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta4~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e3e87029fe464bb61dd0a18a6af59c30527e9e4;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

2e3e87029fe464bb61dd0a18a6af59c30527e9e4