From: Tjerk Meesters <datibbaw@php.net>
Date: Sat, 12 Jul 2014 03:08:50 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.16RC1~52
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8757e2cab8482143a58244eb97669de784e5150d;p=php

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

8757e2cab8482143a58244eb97669de784e5150d