From: Tjerk Meesters <datibbaw@php.net>
Date: Tue, 11 Mar 2014 11:14:43 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.11RC1~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb5178a450055f5b9378efb55732f7e263d210b6;p=php

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

cb5178a450055f5b9378efb55732f7e263d210b6