From: Johannes Schlüter <johannes@php.net>
Date: Wed, 22 May 2013 15:19:58 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0RC2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4fe74f14c437faa845aa03021535d45732e6f89e;p=php

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

4fe74f14c437faa845aa03021535d45732e6f89e