From: Johannes Schlüter <johannes@php.net>
Date: Wed, 5 Jun 2013 14:35:14 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0RC3~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fdeefc466e020e0c3e1d3b585d913f3a88712053;p=php

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

fdeefc466e020e0c3e1d3b585d913f3a88712053