From: Nikita Popov <nikic@php.net>
Date: Sat, 4 Jan 2014 00:24:54 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~49^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d992a972c0b188977cc4d4ad8d35929317f5ddd5;p=php

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

d992a972c0b188977cc4d4ad8d35929317f5ddd5