From: Nikita Popov <nikic@php.net>
Date: Mon, 30 Dec 2013 12:54:58 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~67^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c7ee97eea0c5ab23835f1fc1523c7c3e118d29d0;p=php

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

c7ee97eea0c5ab23835f1fc1523c7c3e118d29d0